Skip to content

Commit

Permalink
chore(travis): setting up travis to run e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
c0bra committed Dec 20, 2013
1 parent 08787be commit d386c4a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ before_script:
script:
- ./scripts/travis/travis_build.sh

# after_success:
after_success:
- grunt release

after_script:
- ./travis_print_logs.sh
13 changes: 11 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,16 @@ module.exports = function(grunt) {
keepAlive: true,
configFile: "./test/protractor.conf.js"
},
singlerun: {},
singlerun: {
keepAlive: false,
options: {
args: {
seleniumPort: 4444,
baseUrl: 'http://localhost:9999',
specs: ['.tmp/doc-scenarios/**/*.spec.js', 'test/e2e/**/*.spec.js']
}
}
},
auto: {
keepAlive: true,
options: {
Expand Down Expand Up @@ -405,7 +414,7 @@ module.exports = function(grunt) {
// grunt.registerTask('test:ci', ['clean', 'jshint', 'ngtemplates', 'karma:sauce']);
grunt.registerTask('test:ci', ['clean', 'jshint', 'ngtemplates', 'serialsauce']);
grunt.registerTask('test:docs', ['connect:testserver', 'protractor:docs']);
grunt.registerTask('test:e2e', ['protractor:singlerun']);
grunt.registerTask('test:e2e', ['connect:testserver', 'protractor:singlerun']);

// Test
grunt.registerTask('test', 'Run tests on singleRun karma server', function() {
Expand Down
3 changes: 2 additions & 1 deletion travis_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ set -e
if [ $JOB = "unit" ]; then
grunt
grunt test:ci
grunt release
elif [ $JOB = "e2e" ]; then
# grunt clean build test:e2e --browsers=SL_Chrome
grunt
grunt test:e2e
else
echo "Unknown job type. Please set JOB=unit or JOB=e2e."
fi

0 comments on commit d386c4a

Please sign in to comment.