Kill protractor-e2e configs

Author: caitp

Gruntfile.js

@@ -77,8 +77,8 @@ module.exports = function(grunt) {
 
                 next();
               },
-              e2e.middleware(),
               util.conditionalCsp(),
+              e2e.middleware(),
               connect.favicon('images/favicon.ico'),
               connect.static(base)
             ];
@@ -104,20 +104,13 @@ module.exports = function(grunt) {
     },
 
 
-    'protractor-docs': {
+    protractor: {
       normal: 'protractor-conf.js',
       travis: 'protractor-travis-conf.js',
       jenkins: 'protractor-jenkins-conf.js'
     },
 
 
-    protractor: {
-      normal: 'protractor-e2e.conf.js',
-      travis: 'protractor-e2e-travis.conf.js',
-      jenkins: 'protractor-e2e-jenkins.conf.js'
-    },
-
-
     clean: {
       build: ['build'],
       tmp: ['tmp']
@@ -328,23 +321,16 @@ module.exports = function(grunt) {
 
 
   //alias tasks
-  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor-docs']);
+  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
   grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
   grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
   grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
   grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
   grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
-  grunt.registerTask('test:e2e', 'Run E2E tests with Protractor with a test server running in the background',
-                     ['webdriver', 'connect:testserver', 'protractor:normal']);
-  grunt.registerTask('test:travis-e2e', 'Run the E2E tests with protractor and keep a test server running in the background',
-                     ['connect:testserver', 'protractor:travis']);
-  grunt.registerTask('test:ci-e2e', 'Run the E2E tests with protractor and keep a test server running in the background',
-                     ['webdriver', 'connect:testserver', 'protractor:jenkins']);
-  grunt.registerTask('test:protractor-docs', 'Run the end to end docs tests with Protractor and keep a test server running in the background',
-                     ['webdriver', 'connect:testserver', 'protractor-docs:normal']);
-  grunt.registerTask('test:travis-protractor-docs', 'Run the end to end docs tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor-docs:travis']);
-  grunt.registerTask('test:ci-protractor-docs', 'Run the end to end docs tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor-docs:jenkins']);
-  grunt.registerTask('test:docs-e2e', 'Alias for test:protractor', ['test:protractor-docs']);
+  grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
+  grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
+  grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
+  grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']);
   grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);
 
   grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);

jenkins_build.sh

@@ -28,7 +28,7 @@ mkdir -p test_out
 grunt test:unit --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color
 
 # END TO END TESTS #
-grunt test:ci-protractor-docs
+grunt test:ci-protractor
 
 # DOCS APP TESTS #
 grunt test:docs --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color

lib/grunt/plugins.js

@@ -57,11 +57,7 @@ module.exports = function(grunt) {
     util.updateWebdriver.call(util, this.async());
   });
 
-  grunt.registerMultiTask('protractor-docs', 'Run Protractor Docs integration tests', function() {
-    util.startProtractor.call(util, this.data, this.async());
-  });
-
-  grunt.registerMultiTask('protractor', 'Run Protractor E2E tests', function() {
+  grunt.registerMultiTask('protractor', 'Run Protractor Docs integration tests', function() {
     util.startProtractor.call(util, this.data, this.async());
   });
 

protractor-conf.js

@@ -3,6 +3,7 @@
 var config = require('./protractor-shared-conf').config;
 
 config.specs = [
+  'test/e2e/tests/**/*.js',
   'build/docs/ptore2e/**/*.js',
   'docs/app/e2e/**/*.scenario.js'
 ];

protractor-e2e-jenkins.conf.js

@@ -4,6 +4,7 @@ exports.config = {
   allScriptsTimeout: 11000,
 
   specs: [
+    'test/e2e/tests/**/*.js',
     'build/docs/ptore2e/**/*.js',
     'docs/app/e2e/*.scenario.js'
   ],

protractor-e2e-travis.conf.js

@@ -15,13 +15,13 @@ elif [ $JOB = "e2e" ]; 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"
   fi
-  grunt test:travis-protractor-docs --specs "$TARGET_SPECS"
+
+  export TARGET_SPECS="test/e2e/tests/**/*.js,$TARGET_SPECS"
+  grunt test:travis-protractor --specs "$TARGET_SPECS"
 else
   echo "Unknown job type. Please set JOB=unit or JOB=e2e-*."
 fi

protractor-e2e.conf.js

@@ -40,6 +40,8 @@ function generateFixture(test, query) {
       var s = util.stat(path.resolve(build, src));
       if (s && s.isFile()) {
         $(script).attr('src', rewriteAngularSrc(src, query));
+      } else {
+        $(script).attr('src', util.rewriteTestFile(test, src));
       }
     }
   });

protractor-jenkins-conf.js

@@ -28,7 +28,7 @@ function rewriteTestFile(testname, testfile) {
   while (testfile[i] === '/') ++i;
   testfile = testfile.slice(i);
   var s = stat(path.resolve(tests, testname, testfile));
-  if (s && s.isFile() || s.isDirectory()) {
+  if (s && (s.isFile() || s.isDirectory())) {
     return ['/test/e2e/fixtures', testname, testfile].join('/');
   }
   return false;