From cf0ba78ee65674ed86ad09efff1a401130b01fcc Mon Sep 17 00:00:00 2001
From: Borys Levytskyi <blevtisky@yandex.ru>
Date: Sun, 12 Apr 2015 16:55:55 +0300
Subject: [PATCH] Support of Firefox in e2e tests

---
 e2e.bat                                     |  2 +-
 e2eall.bat                                  |  1 +
 tests/e2e.all.js                            | 14 ++++++++++++++
 tests/{e2e.chrome.conf.js => e2e.chrome.js} |  6 ------
 tests/e2e/spec.js                           |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 e2eall.bat
 create mode 100644 tests/e2e.all.js
 rename tests/{e2e.chrome.conf.js => e2e.chrome.js} (58%)

diff --git a/e2e.bat b/e2e.bat
index 8b9c3ca..7cc34d2 100644
--- a/e2e.bat
+++ b/e2e.bat
@@ -1 +1 @@
-protractor tests\e2e.chrome.conf.js
\ No newline at end of file
+protractor tests\e2e.chrome.js --params.url='test'
\ No newline at end of file
diff --git a/e2eall.bat b/e2eall.bat
new file mode 100644
index 0000000..7a6e320
--- /dev/null
+++ b/e2eall.bat
@@ -0,0 +1 @@
+protractor tests\e2e.all.js
\ No newline at end of file
diff --git a/tests/e2e.all.js b/tests/e2e.all.js
new file mode 100644
index 0000000..a912269
--- /dev/null
+++ b/tests/e2e.all.js
@@ -0,0 +1,14 @@
+exports.config = {
+    seleniumAddress: 'http://127.0.0.1:4444/wd/hub',
+
+    specs: [
+        './e2e/cmdDriver.js',
+        './e2e/spec.js'
+    ],
+
+    multiCapabilities: [{
+        'browserName': 'chrome'
+    },{
+        'browserName': 'firefox'
+    }]
+};
diff --git a/tests/e2e.chrome.conf.js b/tests/e2e.chrome.js
similarity index 58%
rename from tests/e2e.chrome.conf.js
rename to tests/e2e.chrome.js
index 55ca9b3..aa45059 100644
--- a/tests/e2e.chrome.conf.js
+++ b/tests/e2e.chrome.js
@@ -8,11 +8,5 @@ exports.config = {
 
     capabilities: {
         'browserName': 'chrome'
-    },
-
-    chromeOptions: {
-        binary: "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe",
-        args: [],
-        extensions: []
     }
 };
diff --git a/tests/e2e/spec.js b/tests/e2e/spec.js
index 0c84fa7..295f044 100644
--- a/tests/e2e/spec.js
+++ b/tests/e2e/spec.js
@@ -1,7 +1,7 @@
 browser.ignoreSynchronization = true;
 var By = protractor.By;
 var driver = browser.driver;
-var appUrl = 'http://localhost:63342/BitwiseCmd/src/';
+var appUrl = browser.params.appUrl || 'http://localhost:63342/BitwiseCmd/src/';
 var Key = protractor.Key;
 
 describe('launch of application', function() {