Get Protractor tests partially working on Mac with Chrome

openshift · Sep 15, 2017 · 43e9fd2 · 43e9fd2
1 parent 92bdb41
commit 43e9fd2
Show file tree

Hide file tree

Showing 7 changed files with 389 additions and 346 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -612,7 +612,8 @@ module.exports = function (grunt) {
         // grunt test --browsers=Chrome,Firefox,Safari (be sure karma-<browser_name>-launcher is installed)
         browsers: grunt.option('browsers') ?
                     grunt.option('browsers').split(',') :
-                    ['Firefox']
+                    // ['Firefox']
+                    ['Nightmare']
       },
       unit: {
         singleRun: true,
@@ -629,6 +630,7 @@ module.exports = function (grunt) {
           baseUrl: grunt.option('baseUrl') || ("https://localhost:9000/" + contextRoot + "/")
         }
       },
+      // default is the same as above?
       default: {
         options: {
           configFile: "test/protractor.conf.js",
@@ -638,15 +640,16 @@ module.exports = function (grunt) {
           }
         }
       },
-      mac: {
-        options: {
-          configFile: "test/protractor-mac.conf.js",
-          args: {
-            baseUrl: grunt.option('baseUrl') || ("https://localhost:9000/" + contextRoot + "/"),
-            browser: grunt.option('browser') || "firefox"
-          }
-        }
-      }
+      // ideally we want to drop this.
+      // mac: {
+      //   options: {
+      //     configFile: "test/protractor-mac.conf.js",
+      //     args: {
+      //       baseUrl: grunt.option('baseUrl') || ("https://localhost:9000/" + contextRoot + "/"),
+      //       browser: grunt.option('browser') || "firefox"
+      //     }
+      //   }
+      // }
     },
 
     // Settings for grunt-istanbul-coverage
@@ -745,16 +748,19 @@ module.exports = function (grunt) {
 
   grunt.registerTask('test-integration',
     grunt.option('baseUrl') ?
-    [isMac ? 'protractor:mac' : 'protractor:default'] : // if a baseUrl is defined assume we dont want to run the local grunt server
-    [
-      'clean:server',
-      'development-build',
-      'postcss',
-      'connect:test',
-      'add-redirect-uri',
-      (isMac ? 'protractor:mac' : 'protractor:default'),
-      'clean:server'
-    ]
+      // if a baseUrl is defined assume we dont want to run the local grunt server
+      // [isMac ? 'protractor:mac' : 'protractor:default'] :
+      ['protractor:default'] :  // TODO: 
+      [
+        'clean:server',
+        'development-build',
+        'postcss',
+        'connect:test',
+        'add-redirect-uri',
+        //(isMac ? 'protractor:mac' : 'protractor:default'),
+        'protractor:default',
+        'clean:server'
+      ]
   );
 
   grunt.registerTask('build', [

diff --git a/package.json b/package.json
@@ -39,7 +39,9 @@
     "grunt-newer": "0.7.0",
     "grunt-ng-annotate": "0.3.2",
     "grunt-postcss": "^0.8.0",
-    "grunt-protractor-runner": "1.2.1",
+
+    "grunt-protractor-runner": "^5.0.0",
+
     "grunt-replace": "1.0.1",
     "grunt-svgmin": "0.4.0",
     "grunt-usemin": "2.4.0",
@@ -48,7 +50,6 @@
     "imagemin": "1.0.5",
 
     "jasmine-core": "^2.8.0",
-    "jasmine-beforeall": "0.1.1",
     "jasmine-spec-reporter": "1.1.2",
 
     "jshint-stylish": "0.2.0",
@@ -82,6 +83,7 @@
     "serve": "grunt serve",
     "start": "grunt serve",
     "test-integration": "grunt test-integration",
+    "postinstall": "webdriver-manager update",
     "__postinstall": "node test/upgrade-selenium.js && node_modules/protractor/bin/webdriver-manager update",
     "_postinstall": "node_modules/protractor/bin/webdriver-manager update"
   }

diff --git a/test/integration/e2e.js b/test/integration/e2e.js
@@ -1,6 +1,5 @@
 'use strict';
 
-require('jasmine-beforeall');
 var h = require('./helpers.js');
 
 describe('', function() {

diff --git a/test/integration/features/user_creates_from_url.spec.js b/test/integration/features/user_creates_from_url.spec.js
@@ -1,7 +1,5 @@
 'use strict';
 
-require('jasmine-beforeall');
-
 const h = require('../helpers');
 const addExtension = require('../helpers/extensions').addExtension;
 const resetExtensions = require('../helpers/extensions').resetExtensions;

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -127,6 +127,7 @@ module.exports = function(config) {
       'karma-firefox-launcher',
       'karma-chrome-launcher',
       'karma-phantomjs-launcher',
+      'karma-nightmare',
       'karma-ng-html2js-preprocessor',
       'karma-jasmine',
       'karma-coverage'
@@ -163,5 +164,12 @@ module.exports = function(config) {
       // outputs the results of coverage reporter to this dir
       dir: 'test-results/coverage/'
     },
+
+    nightmareOptions: {
+      width: 1048,
+      height: 600,
+      show: false,
+    }
+
   });
 };