Revert "Merge pull request #30759 from yzen/bug-1154035-3"

This reverts commit 356bb26, reversing
changes made to 90ed5eb.

apps/calendar/test/marionette/month_view_test.js

@@ -15,8 +15,7 @@ marionette('month view', function() {
         // system window manager) in order for it to do focus-related things.
         'focusmanager.testmode': true,
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   setup(function() {

apps/calendar/test/marionette/today_test.js

@@ -19,8 +19,7 @@ marionette('today', function() {
         // system window manager) in order for it to do focus-related things.
         'focusmanager.testmode': true,
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   setup(function() {

apps/clock/test/marionette/lib/actions.js

@@ -6,7 +6,7 @@ var StopwatchActions = require('./stopwatch_actions');
 var TimerActions = require('./timer_actions');
 var AlarmActions = require('./alarm_actions');
 
-function ClockAppActions(options) {
+function ClockAppActions() {
   this._client = marionette.client({
     profile: {
       prefs: {
@@ -17,8 +17,7 @@ function ClockAppActions(options) {
         // system window manager) in order for it to do focus-related things.
         'focusmanager.testmode': true
       }
-    },
-    desiredCapabilities: options.desiredCapabilities
+    }
   });
 
   this.stopwatch = new StopwatchActions(this._client);

apps/clock/test/marionette/stopwatch_test.js

@@ -2,9 +2,7 @@ marionette('Stopwatch', function() {
   'use strict';
 
   var assert = require('assert');
-  var actions = new (require('./lib/actions'))({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var actions = new (require('./lib/actions'))();
   var stopwatch = actions.stopwatch;
 
   setup(function() {

apps/clock/test/marionette/timer_test.js

@@ -2,9 +2,7 @@ marionette('Timer', function() {
   'use strict';
 
   var assert = require('assert');
-  var actions = new (require('./lib/actions'))({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var actions = new (require('./lib/actions'))();
   var timer = actions.timer;
 
   setup(function() {

apps/communications/contacts/test/marionette/contacts_shortcuts_test.js

@@ -4,10 +4,7 @@ var Contacts = require('./lib/contacts');
 var assert = require('assert');
 
 marionette('Contacts shortcuts > touch', function() {
-  var client = marionette.client({
-    profile: Contacts.config,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: Contacts.config });
   var subject;
   var selectors;
   var actions;

apps/communications/contacts/test/marionette/settings_test.js

@@ -4,10 +4,7 @@ var Contacts = require('./lib/contacts');
 var assert = require('assert');
 
 marionette('Contacts > Settings', function() {
-  var client = marionette.client({
-    profile: Contacts.config,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: Contacts.config });
   var subject;
   var selectors;
   var buttonSelectors;

apps/communications/dialer/test/marionette/keypad_test.js

@@ -7,10 +7,7 @@ var ReflowHelper =
 marionette('Dialer > Keypad', function() {
   var assert = require('assert');
 
-  var client = marionette.client({
-    profile: Dialer.config,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: Dialer.config });
   var subject;
   var selectors;
   var actions;

apps/communications/dialer/test/marionette/navigation_test.js

@@ -4,10 +4,7 @@ var Dialer = require('./lib/dialer');
 marionette('Dialer > Navigation', function() {
   var assert = require('assert');
 
-  var client = marionette.client({
-    profile: Dialer.config,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: Dialer.config });
   var subject;
   var selectors;
   var actions;

apps/findmydevice/test/marionette/findmydevice_test.js

@@ -12,8 +12,7 @@ marionette('Find My Device lock >', function() {
         'test-findmydevice.gaiamobile.org':
           __dirname + '/fixtures/test-findmydevice',
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   setup(function() {

apps/ftu/test/marionette/ftu_test.js

@@ -4,10 +4,7 @@ var Ftu = require('./lib/ftu');
 
 marionette('First Time Use >', function() {
   var ftu;
-  var client = marionette.client({
-    profile: Ftu.clientOptions,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: Ftu.clientOptions });
 
   setup(function() {
     ftu = new Ftu(client);

apps/ftu/test/marionette/wifi_scanning_test.js

@@ -4,10 +4,7 @@ var Ftu = require('./lib/ftu');
 
 marionette('First Time Use > Wifi Scanning Test', function() {
   var ftu;
-  var client = marionette.client({
-    profile: Ftu.clientOptions,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: Ftu.clientOptions });
 
   setup(function() {
     ftu = new Ftu(client);

apps/gallery/test/marionette/delete_image_test.js

@@ -14,8 +14,7 @@ marionette('using the gallery menu', function() {
         'device.storage.testing': true,
         'device.storage.prompt.testing': true
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   setup(function() {

apps/gallery/test/marionette/edit_image_test.js

@@ -16,8 +16,7 @@ marionette('editing an image', function() {
         'device.storage.prompt.testing': true,
         'webgl.force-enabled': true
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   setup(function() {

apps/gallery/test/marionette/empty_image_test.js

@@ -14,8 +14,7 @@ marionette('run gallery without any files', function() {
         'device.storage.testing': true,
         'device.storage.prompt.testing': true,
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   setup(function() {
@@ -27,11 +26,11 @@ marionette('run gallery without any files', function() {
   });
 
   test('should display empty media message', function() {
-
+  
     // Wait for the overlay with 'Use the Camera app to get started' message.
     var overlayView = app.overlayView;
     var overlayTitle = app.overlayTitle;
-    var overlayText = app.overlayText;
+    var overlayText = app.overlayText; 
     var cameraButton = app.cameraButton;
     client.helper.waitForElement(overlayView);
     assert.ok(overlayView.displayed());

apps/gallery/test/marionette/fullscreen_image_test.js

@@ -67,8 +67,8 @@ marionette('the gallery', function() {
     client.waitFor(function() {
       return app.thumbnails.length == 2;
     });
-    assert.ok(app.fullscreenView.displayed());
-
+    assert.ok(app.fullscreenView.displayed());    
+    
     // go back to the thumbnail view, and click the first thumbnail
     app.fullscreenBackButton.click();
     client.waitFor(function() {

apps/music/test/marionette/loading_test.js

@@ -21,8 +21,7 @@ marionette('Music files loading', function() {
       },
 
       apps: apps
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   var music;

apps/music/test/marionette/metadata_test.js

@@ -27,8 +27,7 @@ marionette('Music player metadata', function() {
       },
 
       apps: apps
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   var music;

apps/music/test/marionette/music_test.js

@@ -17,8 +17,7 @@ marionette('Music ui tests', function() {
       },
 
       apps: apps
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   var music, system;

apps/privacy-panel/test/marionette/ftu_guided_tour_test.js

@@ -4,9 +4,7 @@ var assert = require('assert');
 var GtPanels = require('./lib/panels/ftu_guided_tour');
 
 marionette('first time use', function() {
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
   var subject;
 
   setup(function() {

apps/privacy-panel/test/marionette/root_test.js

@@ -9,8 +9,7 @@ marionette('root panel', function() {
       settings: {
         'privacy-panel-gt-complete': true
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
   var subject;
 

apps/search/test/marionette/private_browser_trigger_test.js

@@ -2,9 +2,7 @@
 
 marionette('Private Browser Trigger', function() {
 
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
 
   var search, system;
 

apps/settings/test/marionette/tests/app_storage_settings_test.js

@@ -3,9 +3,7 @@ var Settings = require('../app/app'),
     assert = require('assert');
 
 marionette('manipulate app storage settings', function() {
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
   var settingsApp;
   var appStoragePanel;
 

apps/settings/test/marionette/tests/date_time_settings_test.js

@@ -2,9 +2,7 @@
 var Settings = require('../app/app');
 
 marionette('manipulate date time settings', function() {
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
   var settingsApp;
   var dateTimePanel;
 

apps/settings/test/marionette/tests/media_storage_settings_test.js

@@ -3,9 +3,7 @@ var Settings = require('../app/app'),
     assert = require('assert');
 
 marionette('manipulate media storage settings', function() {
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
   var settingsApp;
   var mediaStoragePanel;
 

apps/settings/test/marionette/tests/support_settings_test.js

@@ -3,9 +3,7 @@ var Settings = require('../app/app'),
     assert = require('assert');
 
 marionette('manipulate support settings', function() {
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
   var settingsApp;
   var supportPanel;
 

apps/sms/test/marionette/phone_number_service_test.js

@@ -5,9 +5,7 @@ var assert = require('assert');
 var TARGET_APP = 'app://sms.gaiamobile.org';
 
 marionette('mozPhoneNumberService: ', function() {
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
 
   var fuzzyMatchTests = [
     ['123', '123', true, 'match same number'],

apps/system/fxa/test/marionette/fxa_launch_test.js

@@ -25,8 +25,7 @@ marionette('Firefox Accounts Launch Tests', function() {
           apps: {
             'test-fxa-client.gaiamobile.org': __dirname + '/test-fxa-client'
           }
-        },
-        desiredCapabilities: { raisesAccessibilityExceptions: true }
+        }
       });
 
     setup(function() {

apps/system/test/marionette/activity_action_menu_test.js

@@ -13,8 +13,7 @@
         prefs: {
           'focusmanager.testmode': true
         }
-      },
-      desiredCapabilities: { raisesAccessibilityExceptions: true }
+      }
     });
 
     setup(function() {

apps/system/test/marionette/activity_callee_alert_test.js

@@ -14,8 +14,7 @@
                                            '/../apps/activitycaller',
           'activitycallee.gaiamobile.org': __dirname + '/../apps/activitycallee'
         }
-      },
-      desiredCapabilities: { raisesAccessibilityExceptions: true }
+      }
     });
 
     test('Should have only one alert', function() {

apps/system/test/marionette/apps_test.js

@@ -4,9 +4,7 @@ var assert = require('chai').assert;
 
 marionette('mozApps', function() {
 
-  var client = marionette.client({
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client();
 
   suite('getSelf', function() {
     test('multiple calls should all return', function() {

apps/system/test/marionette/attention_window_and_permission_prompt_test.js

@@ -10,8 +10,7 @@ marionette('AttentionWindow - Permission Prompt', function() {
   var client = marionette.client({
     profile: {
       apps: apps
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   var system;

apps/system/test/marionette/browser_chrome_packaged_app_layout_test.js

@@ -8,8 +8,7 @@ marionette('Browser - App /w Fullscreen Navigation Chrome', function() {
       apps: {
         'hosted_nav_app.gaiamobile.org': __dirname + '/../apps/hosted_nav_app',
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   var system;

apps/system/test/marionette/browser_fullscreen_navigation_chrome_test.js

@@ -12,8 +12,7 @@ marionette('Browser - App /w Fullscreen Navigation Chrome', function() {
       apps: {
         'fullscreennavapp.gaiamobile.org': FULLSCREENNAVAPP,
       }
-    },
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
+    }
   });
 
   var actions, home, rocketbar, search, system, frame, server;

apps/system/test/marionette/context_menu_test.js

@@ -18,10 +18,7 @@ marionette('Test Context Menu Events', function() {
 
   opts.apps[APP_HOST] = __dirname + '/../apps/' + APP_NAME;
 
-  var client = marionette.client({
-    profile: opts,
-    desiredCapabilities: { raisesAccessibilityExceptions: true }
-  });
+  var client = marionette.client({ profile: opts });
   var actions;
 
   test('Test basic context menu functionality', function() {