Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit e81e027

Browse files
committed
browser + ptor fixes
1 parent b5e4ab6 commit e81e027

File tree

2 files changed

+45
-2
lines changed

2 files changed

+45
-2
lines changed

tests/browsers.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[
22
{
33
"name": "chrome",
4-
"version": "35"
4+
"version": "35",
5+
"platform": "OS X 10.9"
56
},
67
{
78
"name": "firefox",
@@ -10,14 +11,16 @@
1011
{
1112
"name": "safari",
1213
"platform": "OS X 10.9",
13-
"version": "30"
14+
"version": "7"
1415
},
1516
{
17+
"device": "iPhone",
1618
"name": "iphone",
1719
"platform": "OS X 10.9",
1820
"version": "7.1"
1921
},
2022
{
23+
"device": "Android",
2124
"name": "android",
2225
"platform": "linux",
2326
"version": "4.3"

tests/sauce_protractor.conf.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
exports.config = {
2+
// Locally, we should just use the default standalone Selenium server
3+
// In Travis, we set up the Selenium serving via Sauce Labs
4+
sauceUser: process.env.SAUCE_USERNAME,
5+
sauceKey: process.env.SAUCE_ACCESS_KEY,
6+
7+
// Tests to run
8+
specs: [
9+
'./protractor/**/*.spec.js'
10+
],
11+
12+
// Capabilities to be passed to the webdriver instance
13+
// For a full list of available capabilities, see https://code.google.com/p/selenium/wiki/DesiredCapabilities
14+
capabilities: {
15+
'browserName': 'chrome',
16+
'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
17+
'build': process.env.TRAVIS_BUILD_NUMBER,
18+
'name': 'AngularFire Protractor Tests Build ' + process.env.TRAVIS_BUILD_NUMBER
19+
},
20+
21+
// Calls to protractor.get() with relative paths will be prepended with the baseUrl
22+
baseUrl: 'http://localhost:3030/tests/protractor/',
23+
24+
// Selector for the element housing the angular app
25+
rootElement: 'body',
26+
27+
// Options to be passed to minijasminenode
28+
jasmineNodeOpts: {
29+
// onComplete will be called just before the driver quits.
30+
onComplete: null,
31+
// If true, display spec names.
32+
isVerbose: true,
33+
// If true, print colors to the terminal.
34+
showColors: true,
35+
// If true, include stack traces in failures.
36+
includeStackTrace: true,
37+
// Default time to wait in ms before a test fails.
38+
defaultTimeoutInterval: 20000
39+
}
40+
};

0 commit comments

Comments
 (0)