Skip to content

Commit ba26d58

Browse files
committed
Using progrator from grunt package
1 parent 80bbcc3 commit ba26d58

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ node_modules/
44
.DS_Store
55
.grunt
66
_SpecRunner.html
7-
tests/bundle/
7+
tests/bundle/
8+
.idea/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,5 +210,5 @@ Included in the code base is an extensive list examples on how to use all the fe
210210
To run these tests locally, please follow these steps from the root directory:
211211

212212
1. `npm install`
213-
2. `node_modules/.bin/webdriver-manager update`
213+
2. `npm webdriver-update`
214214
3. `npm run example`

example/protractor-conf.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@ var config = {
1515
};
1616

1717
if (process.env.TRAVIS) {
18-
//Run PhantomJS on Travis
19-
config.capabilities = {
20-
browserName: 'phantomjs',
21-
'phantomjs.binary.path': require('phantomjs').path,
22-
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG'],
23-
shardTestFiles: true,
24-
maxInstances: 2
25-
};
18+
//Run PhantomJS on Travis
19+
config.capabilities = {
20+
browserName: 'phantomjs',
21+
'phantomjs.binary.path': require('phantomjs').path,
22+
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG'],
23+
shardTestFiles: true,
24+
maxInstances: 2
25+
};
2626
} else {
27-
config.capabilities = {
28-
browserName: 'chrome'
29-
}
30-
config.chromeDriver= '../node_modules/protractor/selenium/chromedriver';
27+
config.capabilities = {
28+
browserName: 'chrome'
29+
};
3130
}
3231
exports.config = config;

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"main": "index.js",
66
"scripts": {
77
"example": "grunt example",
8-
"test": "node_modules/.bin/grunt verify"
8+
"test": "node_modules/.bin/grunt verify",
9+
"webdriver-update": "node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update"
910
},
1011
"author": "Carlos Atencio",
1112
"license": "BSD-2-Clause",
@@ -17,8 +18,7 @@
1718
"grunt-contrib-jshint": "~0.10.0",
1819
"grunt-jasmine-node": "~0.2.1",
1920
"grunt-protractor-runner": "^1.1.4",
20-
"phantomjs": "2.1.3",
21-
"protractor": "2.5.1"
21+
"phantomjs": "2.1.3"
2222
},
2323
"repository": {
2424
"type": "git",

0 commit comments

Comments
 (0)