Skip to content

Commit

Permalink
saucelabs tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jtangelder committed Nov 1, 2013
1 parent d81216e commit 1af28ef
Show file tree
Hide file tree
Showing 15 changed files with 206 additions and 9,998 deletions.
17 changes: 2 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
language: node_js
node_js:
- 0.10

env:
global:
- SAUCE_USERNAME=eightmedia
- SAUCE_ACCESS_KEY=974a3041-9fa1-4710-94cd-3802d418ff79
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
- LOGS_DIR=/tmp/hammer-build/logs
- "0.10"

before_script:
- mkdir -p $LOGS_DIR
- ./sauce_connect_setup.sh
- npm install -g grunt-cli
- ./sauce_connect_block.sh

script:
- ./travis_build.sh

after_script:
- ./travis_print_logs.sh
- grunt test
28 changes: 23 additions & 5 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,28 @@ module.exports = (grunt) ->
annotate: false

# tests
karma:
hammer:
'saucelabs-qunit':
all:
options:
configFile: 'karma.conf.coffee'
username: 'hammerjs-ci'
key: '2ede6d02-65b3-4ba9-aec8-44a787af0c81'
build: process.env.TRAVIS_JOB_ID || 'dev'
concurrency: 3

urls: [
'http://0.0.0.0:8000/tests/utils.html',
'http://0.0.0.0:8000/tests/mouseevents.html',
'http://0.0.0.0:8000/tests/mousetouchevents.html',
'http://0.0.0.0:8000/tests/touchevents.html',
'http://0.0.0.0:8000/tests/pointerevents_mouse.html',
'http://0.0.0.0:8000/tests/pointerevents_touch.html'
]
browsers: [
{ browserName: 'chrome' }
{ browserName: 'firefox' }
{ browserName: 'internet explorer', platform: 'Windows 7', version: '9' }
{ browserName: 'internet explorer', platform: 'Windows 8', version: '10'}
]


# Load tasks
Expand All @@ -89,11 +107,11 @@ module.exports = (grunt) ->
grunt.loadNpmTasks 'grunt-contrib-watch'
grunt.loadNpmTasks 'grunt-contrib-jshint'
grunt.loadNpmTasks 'grunt-contrib-connect'
grunt.loadNpmTasks 'grunt-karma'
grunt.loadNpmTasks 'grunt-saucelabs'
grunt.loadNpmTasks 'grunt-tagrelease'


# Default task(s).
grunt.registerTask 'default', ['connect','watch']
grunt.registerTask 'test', ['jshint','karma']
grunt.registerTask 'test', ['jshint','connect','saucelabs-qunit']
grunt.registerTask 'build', ['concat','uglify','test']
102 changes: 0 additions & 102 deletions karma.conf.coffee

This file was deleted.

19 changes: 4 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
},
"repository": {
"type": "git",
"url": "git://github.com/eightmedia/jquery.hammer.js.git"
"url": "git://github.com/EightMedia/jquery.hammer.js.git"
},
"bugs": {
"url": "https://github.com/eightmedia/jquery.hammer.js/issues"
"url": "https://github.com/EightMedia/jquery.hammer.js/issues"
},
"dependencies": {
"hammerjs": "1.0.x"
Expand All @@ -38,20 +38,9 @@
"grunt-contrib-watch": "0.2.x",
"grunt-tagrelease": "0.1.x",
"faketouches": "0.0.x",
"karma-script-launcher": "~0.1.0",
"karma-chrome-launcher": "~0.1.0",
"karma-firefox-launcher": "~0.1.0",
"karma-sauce-launcher": "~0.1.1",
"karma-jasmine": "~0.1.3",
"karma-requirejs": "~0.1.0",
"karma-coffee-preprocessor": "~0.1.0",
"karma-phantomjs-launcher": "~0.1.0",
"karma": "~0.10.4",
"grunt-karma": "~0.6.2",
"qunitjs": "~1.12.0",
"karma-qunit": "~0.1.1",
"grunt-saucelabs": "4.1.x",
"underscore": "~1.5.2",
"hammerjs": "1.0.x"
"hammerjs": "1.0.*"
},
"main": "jquery.hammer.js",
"engines": {
Expand Down
5 changes: 0 additions & 5 deletions sauce_connect_block.sh

This file was deleted.

49 changes: 0 additions & 49 deletions sauce_connect_setup.sh

This file was deleted.

Loading

0 comments on commit 1af28ef

Please sign in to comment.