Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
feat(dependencies): replace PhantomJS in favor of chrome (#1776)
Browse files Browse the repository at this point in the history
* fix(users): test for usernameOrEmail

* Add comment to remind  change for mongo replicaset connection

* clean comment ..

* Generic pageTitle concept

* Revert "Generic pageTitle concept"

This reverts commit ff00ec9.

* align on meanjs state

* fix atom beautify newline

* align to mean indent

* upgrade protractor

* Switch from firefox to chrome for travis

* fix build

* clean npm install protractor

* enable sudo

* clean order for mean

* clean dependencies
  • Loading branch information
PierreBrisorgueil authored and lirantal committed Jul 13, 2017
1 parent 810dd81 commit 16a1dcd
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
dist: trusty
sudo: false
sudo: required
node_js:
- '6.10'
- '7'
Expand All @@ -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
Expand Down
18 changes: 15 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var _ = require('lodash'),

// Karma configuration
module.exports = function (karmaConfig) {
karmaConfig.set({
var configuration = {
frameworks: ['jasmine'],

preprocessors: {
Expand Down Expand Up @@ -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);
};
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,8 @@
"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-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",
Expand Down
11 changes: 0 additions & 11 deletions protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit 16a1dcd

Please sign in to comment.