Merge pull request #16249 from KevinGrandon/revert_bug_969587

Revert "Bug 969587 - Integration tests for FTU variant customization"

apps/browser/build/build.js

@@ -20,8 +20,6 @@ BrowserAppBuilder.prototype.setOptions = function(options) {
 };
 
 BrowserAppBuilder.prototype.initJSON = function() {
-  // Note: The variant integration test in FTU will need to be changed if the
-  // defaults here change, otherwise the tests will fail.
   var defaultJSONpath =
     utils.joinPath(this.appDir.path, 'build', 'default.json');
   var defaultJson = utils.getJSON(utils.getFile(defaultJSONpath));

apps/communications/ftu/test/marionette/ftu_tests.js

@@ -1,34 +1,47 @@
-/* jshint node: true */
-'use strict';
-
 marionette('First Time Use >', function() {
   var assert = require('assert');
-  var FTU = require('./lib/ftu_test_lib').FTU;
+  var FTU = 'app://communications.gaiamobile.org';
+
   var client = marionette.client();
-  var ftu = new FTU(client);
+
+  var clickThruPanel = function(panel_id, button_id) {
+    if (panel_id == '#wifi') {
+      // The wifi panel will bring up a screen to show it is scanning for
+      // networks. Not waiting for this to clear will blow test timing and cause
+      // things to fail.
+      client.helper.waitForElementToDisappear('#loading-overlay');
+    }
+    // waitForElement is used to make sure animations and page changes have
+    // finished, and that the panel is displayed.
+    client.helper.waitForElement(panel_id);
+    if (button_id) {
+      var button = client.waitForElement(button_id);
+      button.click();
+    }
+  };
 
   test('FTU comes up on profile generation', function() {
-    ftu.waitForFTU();
+    client.apps.switchToApp(FTU);
   });
 
   test('FTU click thru', function() {
-    ftu.waitForFTU();
-    ftu.clickThruPanel('#languages', '#forward');
-    ftu.clickThruPanel('#wifi', '#forward');
-    ftu.clickThruPanel('#date_and_time', '#forward');
-    ftu.clickThruPanel('#geolocation', '#forward');
-    ftu.clickThruPanel('#import_contacts', '#forward');
-    ftu.clickThruPanel('#welcome_browser', '#forward');
-    ftu.clickThruPanel('#browser_privacy', '#forward');
-    ftu.clickThruPanel('#finish-screen', undefined);
+    client.apps.switchToApp(FTU);
+    clickThruPanel('#languages', '#forward');
+    clickThruPanel('#wifi', '#forward');
+    clickThruPanel('#date_and_time', '#forward');
+    clickThruPanel('#geolocation', '#forward');
+    clickThruPanel('#import_contacts', '#forward');
+    clickThruPanel('#welcome_browser', '#forward');
+    clickThruPanel('#browser_privacy', '#forward');
+    clickThruPanel('#finish-screen', undefined);
   });
 
   test('FTU Wifi Scanning Tests', function() {
-    ftu.waitForFTU();
-    ftu.clickThruPanel('#languages', '#forward');
-    ftu.clickThruPanel('#wifi', '#forward');
-    ftu.clickThruPanel('#date_and_time', '#back');
-    ftu.clickThruPanel('#wifi', undefined);
+    client.apps.switchToApp(FTU);
+    clickThruPanel('#languages', '#forward');
+    clickThruPanel('#wifi', '#forward');
+    clickThruPanel('#date_and_time', '#back');
+    clickThruPanel('#wifi', undefined);
   });
 
 });