Merge pull request #377 from troolee/tests/end-to-end
move webdriver-manager start to grunt
This commit is contained in:
commit
208a8baf64
|
@ -22,13 +22,12 @@ install:
|
||||||
- npm install -g bower
|
- npm install -g bower
|
||||||
- bower install
|
- bower install
|
||||||
- npm install
|
- npm install
|
||||||
- webdriver-manager update --standalone
|
- ./node_modules/protractor/bin/webdriver-manager update --standalone
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- export CHROME_BIN=chromium-browser
|
- export CHROME_BIN=chromium-browser
|
||||||
- export DISPLAY=:99.0
|
- export DISPLAY=:99.0
|
||||||
- sh -e /etc/init.d/xvfb start
|
- sh -e /etc/init.d/xvfb start
|
||||||
- nohup bash -c "webdriver-manager start 2>&1 &"
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- npm run build
|
- npm run build
|
||||||
|
|
12
Gruntfile.js
12
Gruntfile.js
|
@ -1,3 +1,4 @@
|
||||||
|
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
|
||||||
module.exports = function(grunt) {
|
module.exports = function(grunt) {
|
||||||
grunt.loadNpmTasks('grunt-sass');
|
grunt.loadNpmTasks('grunt-sass');
|
||||||
grunt.loadNpmTasks('grunt-contrib-cssmin');
|
grunt.loadNpmTasks('grunt-contrib-cssmin');
|
||||||
|
@ -9,6 +10,7 @@ module.exports = function(grunt) {
|
||||||
grunt.loadNpmTasks('grunt-contrib-watch');
|
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||||
grunt.loadNpmTasks('grunt-protractor-runner');
|
grunt.loadNpmTasks('grunt-protractor-runner');
|
||||||
grunt.loadNpmTasks('grunt-contrib-connect');
|
grunt.loadNpmTasks('grunt-contrib-connect');
|
||||||
|
grunt.loadNpmTasks('grunt-protractor-webdriver');
|
||||||
|
|
||||||
grunt.initConfig({
|
grunt.initConfig({
|
||||||
sass: {
|
sass: {
|
||||||
|
@ -114,8 +116,16 @@ module.exports = function(grunt) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
protractor_webdriver: {
|
||||||
|
all: {
|
||||||
|
options: {
|
||||||
|
command: 'webdriver-manager start',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify', 'doctoc']);
|
grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify', 'doctoc']);
|
||||||
grunt.registerTask('e2e-test', ['connect', 'protractor']);
|
grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
"grunt-doctoc": "^0.1.1",
|
"grunt-doctoc": "^0.1.1",
|
||||||
"grunt-jscs": "^2.7.0",
|
"grunt-jscs": "^2.7.0",
|
||||||
"grunt-protractor-runner": "^3.0.0",
|
"grunt-protractor-runner": "^3.0.0",
|
||||||
|
"grunt-protractor-webdriver": "^0.2.5",
|
||||||
"grunt-sass": "^1.1.0",
|
"grunt-sass": "^1.1.0",
|
||||||
"jasmine-core": "^2.4.1",
|
"jasmine-core": "^2.4.1",
|
||||||
"karma": "^0.13.21",
|
"karma": "^0.13.21",
|
||||||
|
|
Loading…
Reference in a new issue