Merge pull request #11 from meanjs/master

Update upstream

.travis.yml

@@ -1,14 +1,14 @@
 language: node_js
 dist: trusty
-sudo: false
+sudo: required
 node_js:
   - '6.10'
   - '7'
   - '8'
 matrix:
   fast_finish: true
-  allow_failures:
-    - node_js: '8'
+#  allow_failures:
+#    - node_js: '8'
 os:
   - linux
   - centos
@@ -24,18 +24,18 @@ addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
+    - google-chrome
     packages:
     - g++-4.8
     - gcc-4.8
     - clang
+    - google-chrome-stable
 before_install:
   - npm install nsp -g
 #  - npm install snyk -g
-  - npm install protractor
+  - 'export PATH=$PATH:/usr/lib/chromium-browser/'
   - 'export DISPLAY=:99.0'
   - 'sh -e /etc/init.d/xvfb start'
-  - 'node_modules/protractor/bin/webdriver-manager update --standalone'
-  - 'node_modules/protractor/bin/webdriver-manager start 2>&1 &'
   - sleep 3
 #before_script:
 #  - snyk auth $SNYK_TOKEN

karma.conf.js

@@ -7,11 +7,11 @@ var _ = require('lodash'),
   defaultAssets = require('./config/assets/default'),
   testAssets = require('./config/assets/test'),
   testConfig = require('./config/env/test'),
-  karmaReporters = ['progress'];
+  karmaReporters = ['mocha'];
 
 // Karma configuration
 module.exports = function (karmaConfig) {
-  karmaConfig.set({
+  var configuration = {
     frameworks: ['jasmine'],
 
     preprocessors: {
@@ -54,13 +54,25 @@ module.exports = function (karmaConfig) {
     // - Safari (only Mac)
     // - PhantomJS
     // - IE (only Windows)
-    browsers: ['PhantomJS'],
+    browsers: ['Chrome'],
+    customLaunchers: {
+      Chrome_travis_ci: {
+        base: 'Chrome',
+        flags: ['--no-sandbox']
+      }
+    },
 
     // If browser does not capture in given timeout [ms], kill it
     captureTimeout: 60000,
 
     // Continuous Integration mode
     // If true, it capture browsers, run tests and exit
     singleRun: true
-  });
+  };
+
+  if (process.env.TRAVIS) {
+    configuration.browsers = ['Chrome_travis_ci'];
+  }
+
+  karmaConfig.set(configuration);
 };

package.json

@@ -105,11 +105,9 @@
     "karma": "~1.6.0",
     "karma-chrome-launcher": "~2.0.0",
     "karma-coverage": "~1.1.1",
-    "karma-firefox-launcher": "~1.0.0",
     "karma-jasmine": "~1.1.0",
+    "karma-mocha-reporter": "~2.2.3",
     "karma-ng-html2js-preprocessor": "~1.0.0",
-    "karma-phantomjs-launcher": "~1.0.0",
-    "phantomjs-prebuilt": "~2.1.14",
     "lcov-result-merger": "~1.2.0",
     "run-sequence": "~1.2.2",
     "semver": "~5.3.0",

protractor.conf.js

@@ -5,15 +5,4 @@ var config = {
   specs: ['modules/*/tests/e2e/*.js']
 };
 
-if (process.env.TRAVIS) {
-  config.capabilities = {
-    // Without this setting, Travis CI would default
-    // to using Chrome anyway.
-    // NOTE: Firefox is currently not working with
-    // the Travis CI builds. For more info see:
-    // https://github.com/meanjs/mean/pull/1805
-    browserName: 'chrome'
-  };
-}
-
 exports.config = config;