diff --git a/devtools/client/webide/test/test_build.html b/devtools/client/webide/test/test_build.html index b5acb58c67bc..ffb01998c6d0 100644 --- a/devtools/client/webide/test/test_build.html +++ b/devtools/client/webide/test/test_build.html @@ -40,8 +40,11 @@ let packagedAppLocation = getTestFilePath("build_app" + testSuffix + "1"); + let onValidated = waitForUpdate(win, "project-validated"); + let onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packagedAppLocation); - yield waitForUpdate(win, "details"); + yield onValidated; + yield onDetails; let project = win.AppManager.selectedProject; @@ -77,8 +80,11 @@ // # Now test a full featured package.json packagedAppLocation = getTestFilePath("build_app" + testSuffix + "2"); + onValidated = waitForUpdate(win, "project-validated"); + onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packagedAppLocation); - yield waitForUpdate(win, "project-validated"); + yield onValidated; + yield onDetails; project = win.AppManager.selectedProject; @@ -96,8 +102,11 @@ is(loggedMessages[3], "succeed", "log messages are correct"); // Switch to the package dir in order to verify the generated webapp.manifest + onValidated = waitForUpdate(win, "project-validated"); + onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packageDir); - yield waitForUpdate(win, "project-validated"); + yield onValidated; + yield onDetails; project = win.AppManager.selectedProject; diff --git a/devtools/client/webide/test/test_duplicate_import.html b/devtools/client/webide/test/test_duplicate_import.html index 456778aa78cc..ef01e23e448d 100644 --- a/devtools/client/webide/test/test_duplicate_import.html +++ b/devtools/client/webide/test/test_duplicate_import.html @@ -27,19 +27,21 @@ yield win.AppProjects.load(); is(win.AppProjects.projects.length, 0, "IDB is empty"); - info("to call importPackagedApp(" + packagedAppLocation + ")"); + let onValidated = waitForUpdate(win, "project-validated"); + let onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packagedAppLocation); - yield waitForUpdate(win, "project-validated"); - yield nextTick(); + yield onValidated; + yield onDetails; - info("to call importHostedApp(" + hostedAppManifest + ")"); yield winProject.projectList.importHostedApp(hostedAppManifest); yield waitForUpdate(win, "project-validated"); yield nextTick(); - info("to call importPackagedApp(" + packagedAppLocation + ") again"); + onValidated = waitForUpdate(win, "project-validated"); + onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packagedAppLocation); - yield waitForUpdate(win, "project-validated"); + yield onValidated; + yield onDetails; let project = win.AppManager.selectedProject; is(project.location, packagedAppLocation, "Correctly reselected existing packaged app."); diff --git a/devtools/client/webide/test/test_runtime.html b/devtools/client/webide/test/test_runtime.html index ccde517be3fe..496e8c8b5b96 100644 --- a/devtools/client/webide/test/test_runtime.html +++ b/devtools/client/webide/test/test_runtime.html @@ -90,8 +90,11 @@ let packagedAppLocation = getTestFilePath("app"); + let onValidated = waitForUpdate(win, "project-validated"); + let onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packagedAppLocation); - yield waitForUpdate(win, "project-validated"); + yield onValidated; + yield onDetails; let panelNode = docRuntime.querySelector("#runtime-panel"); let items = panelNode.querySelectorAll(".runtime-panel-item-usb"); diff --git a/devtools/client/webide/test/test_telemetry.html b/devtools/client/webide/test/test_telemetry.html index 89a9761e6965..225ddb89b370 100644 --- a/devtools/client/webide/test/test_telemetry.html +++ b/devtools/client/webide/test/test_telemetry.html @@ -120,8 +120,11 @@ return Task.spawn(function*() { let packagedAppLocation = getTestFilePath("../app"); let winProject = getProjectWindow(win); + let onValidated = waitForUpdate(win, "project-validated"); + let onDetails = waitForUpdate(win, "details"); yield winProject.projectList.importPackagedApp(packagedAppLocation); - yield waitForUpdate(win, "project-validated"); + yield onValidated; + yield onDetails; }); }