Merge pull request #30540 from chenpighead/Bug1173706

Bug 1173706 - Let system bootup and fake app launch use the same marionette client.

apps/system/test/marionette/text_selection_test.js

@@ -11,20 +11,6 @@ marionette('Text selection >', function() {
   apps[FakeTextSelectionApp.ORIGIN] =
     __dirname + '/../apps/faketextselectionapp';
 
-  var client = marionette.client({
-    apps: apps,
-    prefs: {
-      'dom.w3c_touch_events.enabled': 1,
-      'docshell.device_size_is_page_size': true,
-      'dom.mozInputMethod.enabled': false
-    }
-  });
-
-  setup(function() {
-    system = client.loader.getAppClass('system');
-    system.waitForFullyLoaded();
-  });
-
   suite('without lockscreen', function() {
     var fakeTextselectionApp;
     var client = marionette.client({
@@ -38,6 +24,8 @@ marionette('Text selection >', function() {
     });
 
     setup(function() {
+      system = client.loader.getAppClass('system');
+      system.waitForFullyLoaded();
       fakeTextselectionApp = new FakeTextSelectionApp(client);
       action = new Actions(client);
     });
@@ -370,8 +358,9 @@ marionette('Text selection >', function() {
           fakeTextselectionApp.selectAll('BugTextarea');
           assert.ok(fakeTextselectionApp.bubbleVisiblity,
             'bubble should show since we press selectall');
-        });
+      });
     });
+  });
 
   suite('with lockscreen enabled', function() {
     var fakeTextselectionAppWithLockscreen;
@@ -389,6 +378,8 @@ marionette('Text selection >', function() {
     });
 
     setup(function() {
+      system = clientWithLockscreen.loader.getAppClass('system');
+      system.waitForFullyLoaded();
       fakeTextselectionAppWithLockscreen =
         new FakeTextSelectionApp(clientWithLockscreen);
       fakeTextselectionAppWithLockscreen.setTestFrame('bug');
@@ -422,7 +413,6 @@ marionette('Text selection >', function() {
         clientWithLockscreen.waitFor(function() {
           return !fakeTextselectionAppWithLockscreen.bubbleVisiblity;
         });
-      });
     });
   });
 });