Merge pull request #34055 from albertopq/1247566-gij10tv

Bug 1247566 - WaitForStartup and WaitForLaunch on TV tests r=mhenretty
mozilla-b2g · Feb 11, 2016 · 65b7c83 · 65b7c83
2 parents 9261ed3 + 539870f
commit 65b7c83
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js b/tv_apps/smart-system/test/marionette/app_modal_dialog_test.js
@@ -54,12 +54,13 @@ marionette('Test Modal Dialog Events', function() {
   };
 
   setup(function() {
-    system = client.loader.getAppClass('smart-system', 'system', 'tv_apps');
+    system = client.loader.getAppClass('system');
+    system.waitForStartup();
     system.waitForFullyLoaded();
     appModalDialog = new AppModalDialog(client);
     // Launch test app
-    client.apps.launch(APP_URL);
-    client.apps.switchToApp(APP_URL);
+    var frame = system.waitForLaunch(APP_URL);
+    client.switchToFrame(frame);
   });
 
   test('alert modal dialog should disappear', testOptions, function() {