Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1567422 - Part 4: Update tests. r=johannh

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D40418

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tim Huang 2019-08-06 06:01:38 +00:00
parent eab388ccf5
commit 8df5fff324
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/trackingUI/browser_trackingUI_fetch.js
View File

@ -30,8 +30,8 @@ add_task(async function test_fetch() {
"icon box is active"
);
is(
gProtectionsHandler.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.activeTooltip"),
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
gNavigatorBundle.getString("trackingProtection.icon.activeTooltip2"),
"correct tooltip"
);
});

8
browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
View File

@ -58,8 +58,8 @@ function testTrackingPage(window) {
"icon box shows no exception"
);
is(
gProtectionsHandler.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.activeTooltip"),
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
gNavigatorBundle.getString("trackingProtection.icon.activeTooltip2"),
"correct tooltip"
);
}
@ -81,8 +81,8 @@ function testTrackingPageUnblocked() {
"shield shows exception"
);
is(
gProtectionsHandler.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"),
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip2"),
"correct tooltip"
);

35
browser/base/content/test/trackingUI/browser_trackingUI_state.js
View File

@ -30,6 +30,20 @@ var ThirdPartyCookies = null;
var tabbrowser = null;
var gTrackingPageURL = TRACKING_PAGE;
const sBrandBundle = Services.strings.createBundle(
"chrome://branding/locale/brand.properties"
);
const sNoTrackerIconTooltip = gNavigatorBundle.getFormattedString(
"trackingProtection.icon.noTrackersDetectedTooltip",
[sBrandBundle.GetStringFromName("brandShortName")]
);
const sActiveIconTooltip = gNavigatorBundle.getString(
"trackingProtection.icon.activeTooltip2"
);
const sDisabledIconTooltip = gNavigatorBundle.getString(
"trackingProtection.icon.disabledTooltip2"
);
registerCleanupFunction(function() {
TrackingProtection = gProtectionsHandler = ThirdPartyCookies = tabbrowser = null;
UrlClassifierTestUtils.cleanupTestTrackers();
@ -75,9 +89,10 @@ function testBenignPage() {
!gProtectionsHandler.iconBox.hasAttribute("hasException"),
"icon box shows no exception"
);
ok(
!gProtectionsHandler.iconBox.hasAttribute("tooltiptext"),
"icon box has no tooltip"
is(
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
sNoTrackerIconTooltip,
"correct tooltip"
);
ok(
BrowserTestUtils.is_visible(gProtectionsHandler.iconBox),
@ -113,8 +128,8 @@ function testBenignPageWithException() {
"shield shows exception"
);
is(
gProtectionsHandler.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"),
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
sDisabledIconTooltip,
"correct tooltip"
);
@ -170,10 +185,8 @@ function testTrackingPage(window) {
"icon box shows no exception"
);
is(
gProtectionsHandler.iconBox.getAttribute("tooltiptext"),
blockedByTP
? gNavigatorBundle.getString("trackingProtection.icon.activeTooltip")
: "",
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
blockedByTP ? sActiveIconTooltip : sNoTrackerIconTooltip,
"correct tooltip"
);
@ -214,8 +227,8 @@ function testTrackingPageUnblocked(blockedByTP, window) {
"shield shows exception"
);
is(
gProtectionsHandler.iconBox.getAttribute("tooltiptext"),
gNavigatorBundle.getString("trackingProtection.icon.disabledTooltip"),
gProtectionsHandler._trackingProtectionIconTooltipLabel.textContent,
sDisabledIconTooltip,
"correct tooltip"
);