From 8e8bb8c63c93fcc0216f86634bffff6a7b0298d5 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Wed, 15 Jan 2014 01:04:29 -0700 Subject: [PATCH] modified the browser tests, but limiting the tests to integration while debugger --- .travis.yml | 18 +++++++++--------- package.json | 3 +-- test/angular_build_unit_tests.html | 6 +++++- test/browser_build_unit_tests.html | 6 +++++- test/jquery_build_unit_tests.html | 6 +++++- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12bd67a84..40a806eba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/package.json b/package.json index f5e4a6144..8975291ae 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/test/angular_build_unit_tests.html b/test/angular_build_unit_tests.html index 443329ae6..7348371d5 100644 --- a/test/angular_build_unit_tests.html +++ b/test/angular_build_unit_tests.html @@ -15,6 +15,10 @@ - + \ No newline at end of file diff --git a/test/browser_build_unit_tests.html b/test/browser_build_unit_tests.html index 5c1f035c6..23e864967 100644 --- a/test/browser_build_unit_tests.html +++ b/test/browser_build_unit_tests.html @@ -14,6 +14,10 @@ mocha.globals(['mochaRunner', 'elasticsearch']); - + \ No newline at end of file diff --git a/test/jquery_build_unit_tests.html b/test/jquery_build_unit_tests.html index c9dc14560..5f70af5f7 100644 --- a/test/jquery_build_unit_tests.html +++ b/test/jquery_build_unit_tests.html @@ -15,6 +15,10 @@ - + \ No newline at end of file