chore(travis): reorganize protractor configs to group by spec instead of by browser

Use the multiConfiguration ability of Protractor to start tests on multiple browsers
from the same travis cell. Group tests by type (jquery, jqlite, or docs tests) instead
of by browser. Turn on tests for jQuery.

1 files changed, 9 insertions, 29 deletions

diff --git a/protractor-conf.js b/protractor-conf.js
index c21ee68f..9c937c84 100644
--- a/protractor-conf.js
+++ b/protractor-conf.js
@@ -1,32 +1,12 @@
-exports.config = {
-  allScriptsTimeout: 11000,
+var config = require('./protractor-shared-conf').config;
 
-  specs: [
-    'build/docs/ptore2e/**/*jqlite_test.js',
-    'test/e2e/docsAppE2E.js'
-  ],
+config.specs = [
+  'build/docs/ptore2e/**/*.js',
+  'test/e2e/docsAppE2E.js'
+];
 
-  capabilities: {
-    'browserName': 'chrome',
-    'name': 'Angular E2E: jqlite'
-  },
-
-  baseUrl: 'http://localhost:8000/build/docs/',
-
-  framework: 'jasmine',
-
-  onPrepare: function() {
-    // Disable animations so e2e tests run more quickly
-    var disableNgAnimate = function() {
-      angular.module('disableNgAnimate', []).run(function($animate) {
-        $animate.enabled(false);
-      });
-    };
-
-    browser.addMockModule('disableNgAnimate', disableNgAnimate);
-  },
-
-  jasmineNodeOpts: {
-    defaultTimeoutInterval: 30000
-  }
+config.capabilities = {
+  browserName: 'chrome',
 };
+
+exports.config = config;