modified the browser tests, but limiting the tests to integration while debugger

This commit is contained in:
Spencer Alger
2014-01-15 01:04:29 -07:00
parent 57ca30fbc8
commit 8e8bb8c63c
5 changed files with 25 additions and 14 deletions

View File

@ -10,18 +10,18 @@ matrix:
env: ES_BRANCH=master
- node_js: "0.10"
env: ES_BRANCH=master COVERAGE=1
# - node_js: "0.10"
# env: ES_BRANCH=0.90 NODE_UNIT=0
# - node_js: "0.10"
# env: ES_RELEASE=0.90.9 ES_BRANCH=0.90 NODE_UNIT=0
# - node_js: "0.10"
# env: ES_RELEASE=0.90.8 ES_BRANCH=0.90 NODE_UNIT=0
- node_js: "0.10"
env: NODE_UNIT=0 NODE_INTEGRATION=0 TEST_BROWSER='chrome'
env: ES_BRANCH=0.90 NODE_UNIT=0
- node_js: "0.10"
env: NODE_UNIT=0 NODE_INTEGRATION=0 TEST_BROWSER='firefox'
env: ES_RELEASE=0.90.9 ES_BRANCH=0.90 NODE_UNIT=0
- node_js: "0.10"
env: NODE_UNIT=0 NODE_INTEGRATION=0 TEST_BROWSER='ie'
env: ES_RELEASE=0.90.8 ES_BRANCH=0.90 NODE_UNIT=0
# - node_js: "0.10"
# env: NODE_UNIT=0 NODE_INTEGRATION=0 TEST_BROWSER='chrome'
# - node_js: "0.10"
# env: NODE_UNIT=0 NODE_INTEGRATION=0 TEST_BROWSER='firefox'
# - node_js: "0.10"
# env: NODE_UNIT=0 NODE_INTEGRATION=0 TEST_BROWSER='ie'
exclude:
- node_js: false

View File

@ -34,7 +34,6 @@
"sinon": "~1.7.3",
"nock": "0.27.0",
"open": "0.0.4",
"testling": "git://github.com/spenceralger/testling.git",
"load-grunt-tasks": "~0.2.0",
"load-grunt-config": "~0.7.0",
"grunt-s3": "~0.2.0-alpha.3",
@ -49,7 +48,7 @@
"expect.js": "~0.2.0",
"aliasify": "~1.2.1",
"express": "~3.4.7",
"grunt-saucelabs": "git://github.com/spenceralger/grunt-saucelabs.git#stable_mocha_runner"
"grunt-saucelabs": "https://github.com/axemclion/grunt-saucelabs/archive/master.tar.gz"
},
"license": "Apache 2.0",
"dependencies": {

View File

@ -15,6 +15,10 @@
</script>
<script src="angular.js"></script>
<script src="angular_build.js"></script>
<script>var mochaRunner = mocha.run();</script>
<script>
mocha.run().on('end', function(){
window.mochaResults = runner.stats;
});
</script>
</body>
</html>

View File

@ -14,6 +14,10 @@
mocha.globals(['mochaRunner', 'elasticsearch']);
</script>
<script src="browser_build.js"></script>
<script>var mochaRunner = mocha.run();</script>
<script>
mocha.run().on('end', function(){
window.mochaResults = runner.stats;
});
</script>
</body>
</html>

View File

@ -15,6 +15,10 @@
</script>
<script src="jquery.js"></script>
<script src="jquery_build.js"></script>
<script>var mochaRunner = mocha.run();</script>
<script>
mocha.run().on('end', function(){
window.mochaResults = runner.stats;
});
</script>
</body>
</html>