Skip to content

build: do not e2e tests on saucelabs #12700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2018
Merged

build: do not e2e tests on saucelabs #12700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/ci/sources/tunnel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WAIT_RETRIES=2

start_tunnel() {
case "$MODE" in
e2e*|saucelabs*)
saucelabs*)
./scripts/saucelabs/start-tunnel.sh
;;
browserstack*)
Expand All @@ -21,7 +21,7 @@ start_tunnel() {

wait_for_tunnel() {
case "$MODE" in
e2e*|saucelabs*)
saucelabs*)
retryCall ${WAIT_RETRIES} ./scripts/saucelabs/wait-tunnel.sh
;;
browserstack*)
Expand All @@ -34,7 +34,7 @@ wait_for_tunnel() {

teardown_tunnel() {
case "$MODE" in
e2e*|saucelabs*)
saucelabs*)
./scripts/saucelabs/stop-tunnel.sh
;;
browserstack*)
Expand Down
4 changes: 3 additions & 1 deletion scripts/ci/travis-testing.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ wait_for_tunnel
if is_lint; then
$(npm bin)/gulp ci:lint
elif is_e2e; then
$(npm bin)/gulp ci:e2e
# Run e2e tests inside of Xvfb because we need to test the HTML Fullscreen API's that cannot
# be tested within Chrome headless.
xvfb-run -a --server-args='-screen 0, 1024x768x16' $(npm bin)/gulp ci:e2e
elif is_aot; then
$(npm bin)/gulp ci:aot
elif is_payload; then
Expand Down
1 change: 0 additions & 1 deletion scripts/saucelabs/sauce_config.js
View file
Open in desktop

This file was deleted.

41 changes: 15 additions & 26 deletions test/protractor.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ require('ts-node').register({
project: path.join(__dirname, '../e2e/')
});


const E2E_BASE_URL = process.env['E2E_BASE_URL'] || 'http://localhost:4200';
const config = {

exports.config = {
useAllAngular2AppRoots: true,
specs: [ path.join(__dirname, '../e2e/**/*.spec.ts') ],
baseUrl: E2E_BASE_URL,
Expand All @@ -27,34 +27,23 @@ const config = {
// Exclude mat-menu elements because those are empty if not active.
{ id: 'aria-required-children', selector: '*:not(mat-menu)' },

// Disable color constrast checks since the final colors will vary based on the theme.
// Disable color contrast checks since the final colors will vary based on the theme.
{ id: 'color-contrast', enabled: false },
]
}
]
};
],

if (process.env['TRAVIS']) {
const key = require('../scripts/saucelabs/sauce_config');
capabilities: {
browserName: 'chrome',

config.sauceUser = process.env['SAUCE_USERNAME'];
config.sauceKey = key;
config.capabilities = {
'browserName': 'chrome',
'version': 'latest',
'tunnel-identifier': process.env['TRAVIS_JOB_ID'],
'build': process.env['TRAVIS_JOB_ID'],
'name': 'Material E2E Tests',
chromeOptions: {
// Inside of Travis, we need to specify `--no-sandbox` because otherwise Chrome cannot
// be launched properly due to insufficient permissions in a non-sudo environment.
args: process.env['TRAVIS'] ? ['--no-sandbox'] : [],
},

// Enables concurrent testing in the Webdriver. Currently runs five e2e files in parallel.
'maxInstances': 5,
'shardTestFiles': true,

// By default Saucelabs tries to record the whole e2e run. This can slow down the builds.
'recordVideo': false,
'recordScreenshots': false
};
}


exports.config = config;
shardTestFiles: true,
maxInstances: 5,
}
};