Merge pull request #1002 from vojtajina/integration-tests

Integration tests
karma-runner · Apr 1, 2014 · 5aaa4c1 · 5aaa4c1
2 parents 24b1a13 + a04ece7
commit 5aaa4c1
Show file tree

Hide file tree

Showing 51 changed files with 6 additions and 7,560 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,4 +20,5 @@ before_script:
   - rm -rf node_modules/karma
 
 script:
-  - grunt
+  - grunt build test lint
+  - ./scripts/integration-tests.sh
diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh
@@ -0,0 +1,4 @@
+PKG_FILE="$PWD/$(npm pack)"
+git clone https://github.com/karma-runner/integration-tests.git --depth 1
+cd integration-tests
+./run.sh $PKG_FILE
diff --git a/test/e2e/coffee-coverage/karma.conf.coffee b/test/e2e/coffee-coverage/karma.conf.coffee
diff --git a/test/e2e/coffee-coverage/plus.coffee b/test/e2e/coffee-coverage/plus.coffee
diff --git a/test/e2e/coffee-coverage/test.coffee b/test/e2e/coffee-coverage/test.coffee
diff --git a/test/e2e/coffee/karma.conf.coffee b/test/e2e/coffee/karma.conf.coffee
diff --git a/test/e2e/coffee/plus.coffee b/test/e2e/coffee/plus.coffee
diff --git a/test/e2e/coffee/test.coffee b/test/e2e/coffee/test.coffee
diff --git a/test/e2e/coverage/karma.conf.js b/test/e2e/coverage/karma.conf.js
diff --git a/test/e2e/coverage/lib/minus.js b/test/e2e/coverage/lib/minus.js
diff --git a/test/e2e/coverage/lib/plus.js b/test/e2e/coverage/lib/plus.js
diff --git a/test/e2e/coverage/test/minus.spec.js b/test/e2e/coverage/test/minus.spec.js
diff --git a/test/e2e/coverage/test/plus.spec.js b/test/e2e/coverage/test/plus.spec.js
diff --git a/test/e2e/coverageQunit/karma.conf.js b/test/e2e/coverageQunit/karma.conf.js
diff --git a/test/e2e/coverageQunit/lib/minus.js b/test/e2e/coverageQunit/lib/minus.js
diff --git a/test/e2e/coverageQunit/lib/plus.js b/test/e2e/coverageQunit/lib/plus.js
diff --git a/test/e2e/coverageQunit/test/minus.spec.js b/test/e2e/coverageQunit/test/minus.spec.js
diff --git a/test/e2e/coverageQunit/test/plus.spec.js b/test/e2e/coverageQunit/test/plus.spec.js