From fb91b2fe784e665068c209d90c18f5301f46cc26 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Fri, 3 Feb 2017 17:44:34 +0200
Subject: [PATCH] ci(aio): refactor the protractor config (#14248)

1. Use `jasmine` as framework instead of `jasmine2`.
   (Since angular/protractor@2bde92b, `jasmine2` is an alias for `jasmine`.)
2. Simplify the `chromeOptions` config by always setting.
   (If `process.env.CHROME_BIN` is not defined, `binary` will be ignored.)
---
 angular.io/protractor.conf.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/angular.io/protractor.conf.js b/angular.io/protractor.conf.js
index ce058f34f8..4eba335b32 100644
--- a/angular.io/protractor.conf.js
+++ b/angular.io/protractor.conf.js
@@ -11,11 +11,14 @@ exports.config = {
     './e2e/**/*.e2e-spec.ts'
   ],
   capabilities: {
-    'browserName': 'chrome'
+    browserName: 'chrome',
+    chromeOptions: {
+      binary: process.env.CHROME_BIN
+    }
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
-  framework: 'jasmine2',
+  framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,
     defaultTimeoutInterval: 30000,
@@ -31,9 +34,3 @@ exports.config = {
     jasmine.getEnv().addReporter(new SpecReporter());
   }
 };
-
-if (process.env.TRAVIS) {
-  exports.config.capabilities.chromeOptions = {
-    binary: process.env.CHROME_BIN
-  };
-}