From 2b7716975d6cb5914c518a5a7969c3a9bb1e6c70 Mon Sep 17 00:00:00 2001 From: Craig Nishina Date: Tue, 22 Nov 2016 16:56:31 -0800 Subject: [PATCH 1/2] chore(protractor): update protractor to ~4.0.13 package.json - Removed Protractor. `npm test` does not appear to be using Protractor. - Chromedriver 2.25 does not work well with Chromium, use Chrome. packages/angular-cli/blueprints/ng2/files/package.json - Update to protractor 4.0.13. see [changelog](https://github.com/angular/protractor/blob/master/CHANGELOG.md) - Remove webdriver-manager as a dependency. Protractor includes webdriver-manager as a dependency. - Since packages/angular-cli/blueprints/ng2/files/protractor.conf.js uses directConnect with chrome, the pree2e step does not need to download the selenium standalone server or gecko driver. --- .travis.yml | 8 ++++++-- packages/angular-cli/blueprints/ng2/files/package.json | 7 +++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f09e83ca2e5c..583a74c363ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,10 +49,14 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome --force; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir ~/.config && echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then CHROME_BIN=/usr/bin/google-chrome; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libappindicator1 fonts-liberation; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg -i google-chrome*.deb; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi - if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi - npm install -g npm - npm config set spin false diff --git a/packages/angular-cli/blueprints/ng2/files/package.json b/packages/angular-cli/blueprints/ng2/files/package.json index 1cadc809ac30..2bd259ef1f0c 100644 --- a/packages/angular-cli/blueprints/ng2/files/package.json +++ b/packages/angular-cli/blueprints/ng2/files/package.json @@ -8,7 +8,7 @@ "start": "ng serve", "lint": "tslint \"<%= sourceDir %>/**/*.ts\"", "test": "ng test", - "pree2e": "webdriver-manager update", + "pree2e": "webdriver-manager update --standalone false --gecko false", "e2e": "protractor" }, "private": true, @@ -39,10 +39,9 @@ "karma-cli": "^1.0.1", "karma-jasmine": "^1.0.2", "karma-remap-istanbul": "^0.2.1", - "protractor": "4.0.9", + "protractor": "~4.0.13", "ts-node": "1.2.1", "tslint": "^4.0.2", - "typescript": "~2.0.3", - "webdriver-manager": "10.2.5" + "typescript": "~2.0.3" } } From abae90d7d53bbc30441404faec1b4d7cafe39a4b Mon Sep 17 00:00:00 2001 From: Craig Nishina Date: Fri, 9 Dec 2016 13:36:08 -0800 Subject: [PATCH 2/2] experiment - use chromium instead of chrome on linux - will squash if this works --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 583a74c363ec..f09e83ca2e5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,14 +49,10 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome --force; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir ~/.config && echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then CHROME_BIN=/usr/bin/google-chrome; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libappindicator1 fonts-liberation; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg -i google-chrome*.deb; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi - if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi - npm install -g npm - npm config set spin false