Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1372309 - fix browser_sync.js and browser_UITour_availableTargets.js to work with photon structure enabled, r=mikedeboer

Browse Source 
MozReview-Commit-ID: 4bsqWScnRo2

--HG--
extra : rebase_source : a1b0f0dbd35054903469ae1623f56be9d038ad83
This commit is contained in:
Gijs Kruitbosch 2017-06-14 10:18:27 +01:00
parent db6ab29731
commit c6cf08cedd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/test/sync/browser_sync.js
View File

@ -52,7 +52,8 @@ add_task(async function test_ui_state_syncing() {
gSync.updateAllUI(state);
checkSyncNowButton("PanelUI-fxa-icon", true);
let prefix = gPhotonStructure ? "appMenu" : "PanelUI";
checkSyncNowButton(`${prefix}-fxa-icon`, true);
checkSyncNowButton("PanelUI-remotetabs-syncnow", true);
// Be good citizens and remove the "syncing" state.
@ -193,7 +194,7 @@ function checkSyncNowButton(buttonId, syncing, tooltip = null) {
is(remoteTabsButton.getAttribute("tooltiptext"), tooltip, "button tooltiptext is set to the right value");
}
if (buttonId == "PanelUI-fxa-icon") {
if (buttonId.endsWith("-fxa-icon")) {
return;
}

2
browser/components/uitour/test/browser_UITour_availableTargets.js
View File

@ -7,7 +7,7 @@ var gContentWindow;
var hasPocket = Services.prefs.getBoolPref("extensions.pocket.enabled");
var isPhoton = Services.prefs.getBoolPref("browser.photon.structure.enabled");
var hasQuit = !isPhoton ||
false; // Update this with AppConstants.platform != "macosx" after bug 1368734 lands;
AppConstants.platform != "macosx";
var hasLibrary = isPhoton || false;
requestLongerTimeout(2);