test commit

README.md

@@ -169,3 +169,4 @@ You could generate single app doc with this:
 ```sh
 $ gulp jsdoc:system
 ```
+

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() {

tv_apps/smart-system/test/marionette/lib/system.js

@@ -54,7 +54,7 @@ System.prototype = {
     var body = this.client.findElement('body');
     this.client.waitFor(function() {
       return body.getAttribute('ready-state') == 'fullyLoaded';
-    });
+    }, { timeout: 120000 });
   },
 
   waitForLaunch: function(url) {