Merge pull request #4954 from chenba/4886-hello

Fix #hello onboarding
mozilla-services · Sep 26, 2018 · d1015ea · d1015ea
2 parents bd409f4 + 45f6def
commit d1015ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/test/test.js b/test/test.js
@@ -362,6 +362,13 @@ describe("Test Screenshots", function() {
     }).catch(done);
   });
 
+  it("should show onboarding with #hello", async function() {
+    await driver.get(`${backend}/#hello`);
+    await driver.setContext(firefox.Context.CONTENT);
+    const slideFrame = await driver.wait(until.elementLocated(By.id(SLIDE_IFRAME_ID)));
+    assert(slideFrame, "Navigating to #hello should show onboarding");
+  });
+
   it("should download a shot", function(done) {
     const startingFileCount = fs.readdirSync(downloadDir).length;
     const filenameRegex = /^Screenshot.+ Firefox Screenshots\.png$/;

diff --git a/webextension/background/main.js b/webextension/background/main.js
@@ -71,7 +71,7 @@ this.main = (function() {
       if (!isLoaded) {
         sendEvent("start-shot", "site-request", {incognito: tab.incognito});
         setIconActive(true, tab.id);
-        selectorLoader.toggle(tab.id, false);
+        selectorLoader.toggle(tab.id, Promise.resolve(false));
       }
     });
   }