Update test dependencies

Version Updates:

* geckodriver 1.8.1
* karma-jasmine 1.1.0
* protractor 5.1.2
* selenium-webdriver 3.5.0

Other changes:

* Remove no-longer-needed upgrade-selenium script
* Remove no-longer-needed jasmine-beforeall (built into jasmine now)
* Use Node 6.x for Travis (required for latest dependencies)
* Fix failing unit tests under newer jasmine version

Author: spadgett

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "4"
+  - "6"
 before_script:
   - make build
 script:

app/scripts/services/applicationGenerator.js

@@ -351,15 +351,19 @@ angular.module("openshiftConsole")
             sourceStrategy: {
               from: {
                 kind: "ImageStreamTag",
-                name: input.imageName + ":" + input.imageTag,
-                namespace: input.namespace
+                name: input.imageName + ":" + input.imageTag
               },
               env: env
             }
           },
           triggers: triggers
         }
       };
+
+      if (input.namespace) {
+        bc.spec.strategy.sourceStrategy.namespace = input.namespace;
+      }
+
       if (_.get(input, 'buildConfig.secrets.gitSecret[0].name')) {
         bc.spec.source.sourceSecret = _.head(input.buildConfig.secrets.gitSecret);
       }

app/scripts/services/membership/membership.js

@@ -94,13 +94,16 @@ angular
                         _.each(rolebinding.subjects, function(subject) {
                           var subjectKey = uniqueKey(subject.namespace, subject.name);
                           if(!result[subject.kind].subjects[subjectKey]) {
-                            result[subject.kind].subjects[subjectKey]  = {
+                            var subjectValue = {
                               name: subject.name,
-                              namespace: subject.namespace,
                               roles: {}
                             };
+                            if (subject.namespace) {
+                              subjectValue.namespace = subject.namespace;
+                            }
+                            result[subject.kind].subjects[subjectKey]  = subjectValue;
                           }
-                          if(!_.includes(result[subject.kind].subjects[subjectKey].roles, roleKey)) {
+                          if(roles[roleKey] && !_.includes(result[subject.kind].subjects[subjectKey].roles, roleKey)) {
                             result[subject.kind].subjects[subjectKey].roles[roleKey] = roles[roleKey];
                           }
                         });

dist/scripts/scripts.js

@@ -1481,16 +1481,15 @@ type: "Source",
 sourceStrategy: {
 from: {
 kind: "ImageStreamTag",
-name: e.imageName + ":" + e.imageTag,
-namespace: e.namespace
+name: e.imageName + ":" + e.imageTag
 },
 env: n
 }
 },
 triggers: a
 }
 };
-return _.get(e, "buildConfig.secrets.gitSecret[0].name") && (l.spec.source.sourceSecret = _.head(e.buildConfig.secrets.gitSecret)), e.buildConfig.contextDir && (l.spec.source.contextDir = e.buildConfig.contextDir), l;
+return e.namespace && (l.spec.strategy.sourceStrategy.namespace = e.namespace), _.get(e, "buildConfig.secrets.gitSecret[0].name") && (l.spec.source.sourceSecret = _.head(e.buildConfig.secrets.gitSecret)), e.buildConfig.contextDir && (l.spec.source.contextDir = e.buildConfig.contextDir), l;
 }, o._generateImageStream = function(e) {
 return {
 apiVersion: "v1",
@@ -2324,11 +2323,14 @@ var a = _.reduce(e, function(e, a) {
 var r = n(a.roleRef.namespace ? "Role" : "ClusterRole", a.roleRef.name);
 return _.each(a.subjects, function(a) {
 var o = n(a.namespace, a.name);
-e[a.kind].subjects[o] || (e[a.kind].subjects[o] = {
+if (!e[a.kind].subjects[o]) {
+var i = {
 name: a.name,
-namespace: a.namespace,
 roles: {}
-}), _.includes(e[a.kind].subjects[o].roles, r) || (e[a.kind].subjects[o].roles[r] = t[r]);
+};
+a.namespace && (i.namespace = a.namespace), e[a.kind].subjects[o] = i;
+}
+t[r] && !_.includes(e[a.kind].subjects[o].roles, r) && (e[a.kind].subjects[o].roles[r] = t[r]);
 }), e;
 }, {
 User: {

package.json

@@ -11,7 +11,7 @@
     "bower": "1.8.0",
     "clean-css": "3.4.12",
     "connect-modrewrite": "0.7.9",
-    "geckodriver": "1.6.0",
+    "geckodriver": "1.8.1",
     "grunt": "0.4.5",
     "grunt-angular-templates": "1.0.3",
     "grunt-cli": "1.1.0",
@@ -40,22 +40,21 @@
     "grunt-wiredep": "3.0.0",
     "html-minifier": "1.1.1",
     "imagemin": "1.0.5",
-    "jasmine-beforeall": "0.1.1",
     "jasmine-spec-reporter": "4.0.0",
     "jshint-stylish": "0.2.0",
     "karma": "0.12.23",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "0.2.6",
     "karma-firefox-launcher": "^1.0.0",
-    "karma-jasmine": "0.1.5",
+    "karma-jasmine": "1.1.0",
     "karma-ng-html2js-preprocessor": "1.0.0",
     "karma-phantomjs-launcher": "^1.0.4",
     "less": "2.6.1",
     "load-grunt-tasks": "0.4.0",
     "lodash": "3.10.1",
-    "protractor": "5.1.1",
+    "protractor": "^5.1.2",
     "protractor-screenshot-reporter": "0.0.5",
-    "selenium-webdriver": "3.4.0",
+    "selenium-webdriver": "3.5.0",
     "serve-static": "1.10.2",
     "time-grunt": "0.3.2"
   },
@@ -70,6 +69,6 @@
     "serve": "grunt serve",
     "start": "grunt serve",
     "test-integration": "grunt test-integration",
-    "postinstall": "node test/upgrade-selenium.js && node_modules/protractor/bin/webdriver-manager update"
+    "postinstall": "node_modules/protractor/bin/webdriver-manager update"
   }
 }

test/integration/e2e.js

@@ -1,6 +1,5 @@
 'use strict';
 
-//require('jasmine-beforeall');
 var h = require('./helpers.js');
 
 describe('', function() {

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;