Skip to content

Commit

Permalink
Separate selenium tests from unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jhchen committed Jul 29, 2014
1 parent 0472b8f commit 4468872
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 18 deletions.
42 changes: 28 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js
node_js: '0.10'
script:
- grunt test:$BROWSER
- grunt travis:$TEST
before_install:
- npm install -g grunt-cli
- source config/sauce.sh
Expand All @@ -12,18 +12,32 @@ env:
- secure: "Smk4w36atd3Ttj0XsoEZr6dMplTWsK52E70EpxTV72hTQIYa3w5uHMEKpg/sZ9ZFfYQF7Rx003Dmbq9AUGPxqlgPtE8CFWlqYBRAVmvQHTEHmhzIKe0NJ8cXtWWVLnnqbsd9vanXGhd8jjC65ZJYQfOVsbPMShVwv2bSLcTr0cE="
- secure: "Mgrp2KtzPaZIG36ZoKleP2WneOamT5WFIFUDhS0mj4jbAFSjXWGnRJI7R0XuT9wDmS/f0gIsxazFELXher9CAmsa3VINFW3cVztykqIMSD5HBhyOyTuVzi6q3tvhx2u/OCxqV8o12XrgGJnKwnBuHbapHqhM39CJI2UjYhsgct8="
matrix:
- BROWSER=mac-chrome
- BROWSER=mac-firefox
- BROWSER=mac-safari
- BROWSER=windows-firefox
- BROWSER=windows-chrome
- BROWSER=windows-ie-11
- BROWSER=windows-ie-10
- BROWSER=windows-ie-9
- BROWSER=linux-chrome
- BROWSER=linux-firefox
- BROWSER=ipad
- BROWSER=iphone
- BROWSER=android
- TEST=unit-mac-chrome
- TEST=unit-mac-firefox
- TEST=unit-mac-safari
- TEST=unit-windows-firefox
- TEST=unit-windows-chrome
- TEST=unit-windows-ie-11
- TEST=unit-windows-ie-10
- TEST=unit-windows-ie-9
- TEST=unit-linux-chrome
- TEST=unit-linux-firefox
- TEST=unit-ipad
- TEST=unit-iphone
- TEST=unit-android
- TEST=wd-mac-chrome
- TEST=wd-mac-firefox
- TEST=wd-windows-firefox
- TEST=wd-windows-chrome
- TEST=wd-windows-ie-11
- TEST=wd-windows-ie-10
- TEST=wd-windows-ie-9
- TEST=e2e-mac-chrome
- TEST=e2e-mac-firefox
- TEST=e2e-windows-firefox
- TEST=e2e-windows-chrome
- TEST=e2e-windows-ie-11
- TEST=e2e-windows-ie-10
- TEST=e2e-windows-ie-9
addons:
sauce_connect: true
7 changes: 3 additions & 4 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ module.exports = (grunt) ->
])

_.each(browsers, (config, browser) ->
tasks = ['connect:server', "karma:#{browser}"]
unless browser == 'iphone' or browser == 'ipad' or browser == 'mac-safari'
tasks.push("protractor:wd-#{browser}", "protractor:e2e-#{browser}")
grunt.registerTask("test:#{browser}", tasks)
grunt.registerTask("travis:unit-#{browser}", ['connect:server', "karma:#{browser}"])
grunt.registerTask("travis:wd-#{browser}", ['connect:server', "protractor:wd-#{browser}"])
grunt.registerTask("travis:e2e-#{browser}", ['connect:server', "protractor:e2e-#{browser}"])
)

0 comments on commit 4468872

Please sign in to comment.