From 39c82f3fb7a8459304d5e07dc87bd0623ad1efd0 Mon Sep 17 00:00:00 2001
From: Julie
Date: Wed, 19 Feb 2014 21:01:54 -0800
Subject: 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.
---
 protractor-conf.js | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

(limited to 'protractor-conf.js')

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;
-- 
cgit v1.2.3