Merge "Run npm nodejs job with Firefox browser"

bindep.txt

@@ -1,6 +1,5 @@
 # selenium tests
 firefox [selenium]
-libfontconfig1 [nodejs platform:dpkg]
 xvfb [selenium platform:dpkg]
 # already part of xorg-x11-server on openSUSE
 xorg-x11-server-Xvfb [selenium platform:redhat]

karma.conf.js

@@ -140,7 +140,7 @@ module.exports = function (config) {
 
     frameworks: ['jasmine'],
 
-    browsers: ['PhantomJS'],
+    browsers: ['Firefox'],
 
     phantomjsLauncher: {
       // Have phantomjs exit if a ResourceError is encountered
@@ -152,7 +152,7 @@ module.exports = function (config) {
     //reporters: ['spec'],
 
     plugins: [
-      'karma-phantomjs-launcher',
+      'karma-firefox-launcher',
       'karma-jasmine',
       'karma-ng-html2js-preprocessor',
       'karma-spec-reporter',

package.json

@@ -10,7 +10,7 @@
     "eslint-config-openstack": "1.2.4",
     "jasmine-core": "2.4.1",
     "karma": "1.1.2",
-    "karma-phantomjs-launcher": "1.0.1",
+    "karma-firefox-launcher": "2.1.0",
     "karma-cli": "^1.0.1",
     "karma-jasmine": "1.0.2",
     "karma-ng-html2js-preprocessor": "1.0.0",