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

Bug 1024734 - Wait correctly when calling importPackagedApp in WebIDE tests. r=jryans

Browse Source 
MozReview-Commit-ID: 7w5QcPrJUJY
This commit is contained in:
Alexandre Poirot 2016-10-11 09:47:45 -07:00
parent cb5dee2078
commit 90ab401d69
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devtools/client/webide/test/test_build.html
View File

@ -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;

14
devtools/client/webide/test/test_duplicate_import.html
View File

@ -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.");

5
devtools/client/webide/test/test_runtime.html
View File

@ -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");

5
devtools/client/webide/test/test_telemetry.html
View File

@ -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;
});
}