Skip to content

Commit

Permalink
chore: Refactor the situation a bit for protractor. Can run locally now
Browse files Browse the repository at this point in the history
  • Loading branch information
hansl committed Apr 1, 2016
1 parent 1f995c4 commit 5a6657a
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 118 deletions.
98 changes: 0 additions & 98 deletions e2e/_screenshot.js

This file was deleted.

2 changes: 0 additions & 2 deletions e2e/index.e2e.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const screenshot = require('./_screenshot.js');

describe('hello, protractor', function () {
describe('index', function () {
browser.get('/');
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"tslint": "tslint -c tslint.json 'src/**/*.ts'",
"typings": "typings install --ambient",
"postinstall": "npm run typings",
"e2e": "protractor ./protractor.conf.js",
"e2e": "protractor test/protractor.conf.js",
"inline-resources": "gulp inline-resources"
},
"version": "2.0.0-alpha.1",
Expand All @@ -27,8 +27,6 @@
"angular2": "2.0.0-beta.12",
"es6-promise": "^3.0.2",
"es6-shim": "^0.35.0",
"mapnik": "^3.5.2",
"protractor": "^3.1.1",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"systemjs": "0.19.4",
Expand Down Expand Up @@ -60,6 +58,7 @@
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "^0.3.6",
"karma-sauce-launcher": "^0.2.14",
"protractor": "^3.1.1",
"strip-ansi": "^3.0.0",
"symlink-or-copy": "^1.0.1",
"ts-node": "^0.5.5",
Expand Down
15 changes: 0 additions & 15 deletions protractor.conf.js

This file was deleted.

27 changes: 27 additions & 0 deletions test/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* This file is Node ES6 and will not be translated to Dart.
*/
const path = require('path');

const E2E_BASE_URL = process.env['E2E_BASE_URL'] || 'http://localhost:4200';
const config = {
useAllAngular2AppRoots: true,
specs: [ path.join(__dirname, '../e2e/**/*.e2e.js') ],
baseUrl: E2E_BASE_URL
};


if (process.env['TRAVIS'] !== undefined) {
const key = require('../scripts/sauce/sauce_config');
config.sauceUser = process.env['SAUCE_USERNAME'];
config.sauceKey = key;
config.capabilities = {
'browserName': 'chrome',
'tunnel-identifier': process.env['TRAVIS_JOB_NUMBER'],
'build': process.env['TRAVIS_JOB_NUMBER'],
'name': 'Material 2 E2E Tests'
};
}


exports.config = config;

0 comments on commit 5a6657a

Please sign in to comment.