WIP: try to run both jquery and non-jquery E2E tests on Travis

angular · caitp · Oct 10, 2014 · Oct 15, 2014 · Oct 15, 2014 · Oct 15, 2014
commit c9f18d09922b8a9369633ef5543fc68252198cf5
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
@@ -11,6 +11,12 @@ if [ $JOB = "unit" ]; then
   grunt tests:docs --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
   grunt test:travis-protractor-docs --specs "docs/app/e2e/**/*.scenario.js"
 elif [ $JOB = "e2e" ]; then
+  if [ $TEST_TARGET = "jquery" ]; then
+    export USE_JQUERY=1
+  fi
+
+  grunt test:travis-e2e
+
   export TARGET_SPECS="build/docs/ptore2e/**/default_test.js"
   if [ $TEST_TARGET = "jquery" ]; then
     TARGET_SPECS="build/docs/ptore2e/**/jquery_test.js"

diff --git a/test/e2e/tests/helpers/main.js b/test/e2e/tests/helpers/main.js
@@ -10,6 +10,10 @@ var helper = {
       fixture += '/';
     }
 
+    if (process.env.USE_JQUERY) {
+      fixture += '?jquery';
+    }
+
     browser.get('/e2e/fixtures/' + fixture);
     return helper;
   }