Merge pull request #33046 from mikehenrty/bug-1219701-quick-settings-gij

Bug 1219701 - Make sure quick setting button launches Settings app
mozilla-b2g · Nov 9, 2015 · a5b6138 · a5b6138
2 parents 23cab7e + e25a43c
commit a5b6138
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/apps/system/test/marionette/utility_tray_gestures_test.js b/apps/system/test/marionette/utility_tray_gestures_test.js
@@ -4,6 +4,8 @@
 var UtilityTray = require('./lib/utility_tray');
 var assert = require('assert');
 
+var SETTINGS_APP = 'app://settings.gaiamobile.org';
+
 marionette('Utility Tray - Gestures', function() {
   var client = marionette.client({
     desiredCapabilities: { raisesAccessibilityExceptions: true }
@@ -59,10 +61,12 @@ marionette('Utility Tray - Gestures', function() {
   test('Tapping "settings"', function() {
     utilityTray.swipeDown();
     utilityTray.waitForOpened();
-    client.executeScript(function() {
-      document.getElementById('quick-settings-full-app').click();
-    });
+    utilityTray.quickSettings.tap();
     utilityTray.waitForClosed();
+    client.waitFor(function() {
+      var settings = system.getAppIframe(SETTINGS_APP);
+      return settings.ariaDisplayed();
+    });
     assert.equal(false, utilityTray.shown);
   });