From a5350437c7371c061fa8622267627826fbf32670 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 21 Apr 2020 12:15:41 +0200
Subject: [PATCH] FEAT #11895 TIME 1:15 add multiCapabilities for protractor

---
 package.json                    |  2 +-
 test/e2e/conf.js                | 30 ++++++++++++++++++++++--------
 test/e2e/index-resource-spec.js | 17 +++++++++--------
 test/e2e/screenshots/.gitkeep   |  0
 4 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 test/e2e/screenshots/.gitkeep

diff --git a/package.json b/package.json
index a1974f165b6..51403c2c5a8 100755
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "upgrade": "ncu -u",
     "create-component": "echo Component name ? && read varname && ng g c $varname --module app",
     "create-component-admin": "echo Component name ? && read varname && ng g c administration/$varname --module administration",
-    "ee-launch": "webdriver-manager update --versions.chrome=80.0.3987.162 && webdriver-manager start --detach --versions.chrome=80.0.3987.162 && protractor test/e2e/conf.js && webdriver-manager shutdown && fuser -k 4444/tcp && base64 exception.png",
+    "ee-launch": "rm test/e2e/screenshots/* && webdriver-manager update --versions.chrome=80.0.3987.162 && webdriver-manager start --detach --versions.chrome=80.0.3987.162 && protractor test/e2e/conf.js && webdriver-manager shutdown && fuser -k 4444/tcp",
     "ee-update": "webdriver-manager update",
     "ee-start-server": "webdriver-manager start",
     "ee-test": "protractor test/e2e/conf.js"
diff --git a/test/e2e/conf.js b/test/e2e/conf.js
index 3f1fa90b557..3708ca418ba 100644
--- a/test/e2e/conf.js
+++ b/test/e2e/conf.js
@@ -1,16 +1,30 @@
 exports.config = {
-    baseUrl: 'http://127.0.0.1/MaarchCourrier',
+    baseUrl: 'http://127.0.0.1/maarch_courrier_develop/cs_recette',
     seleniumAddress: 'http://localhost:4444/wd/hub',
     specs: [
         'index-resource-spec.js',
         //'login-spec.js',
         //'about-us-spec.js'
     ],
-    capabilities: {
-        browserName: 'chrome',
-        chromeOptions: {
-            args: ["--no-sandbox", "--headless", "--disable-gpu", "--window-size=800,600" ]
+    multiCapabilities: [
+        {
+            'browserName': 'chrome',
+            'chromeOptions': {
+                'args': ["--no-sandbox", "--headless", "--disable-gpu",  "--window-size=1920,1080"]
+            },
         },
-    },
-    chromeDriver: '/usr/bin/chromedriver'
-};
+        {
+            'browserName': 'firefox',
+            'moz:firefoxOptions': {
+                'args': ["--headless", "--width=1920", "--height=1080"]
+            }
+        }
+    ],
+    chromeDriver: '/usr/bin/chromedriver',
+
+    onPrepare: () => {
+        browser.driver.getCapabilities().then(function(caps){
+            browser.browserName = caps.get('browserName');
+        });
+    }
+};
\ No newline at end of file
diff --git a/test/e2e/index-resource-spec.js b/test/e2e/index-resource-spec.js
index 947d2b295b3..c68a316b6e2 100644
--- a/test/e2e/index-resource-spec.js
+++ b/test/e2e/index-resource-spec.js
@@ -7,12 +7,13 @@ function writeScreenShot(data, filename) {
     stream.end();
 }
 
-describe('index resource page', function() {
-    it('login to app', function() {
+describe('index resource page', function () {
+    it('login to app', function () {
         browser.waitForAngularEnabled(true);
-        browser.get(browser.baseUrl+ '/dist/index.html#/login');
+        browser.get(browser.baseUrl + '/dist/index.html#/login');
+        browser.sleep(500);
         browser.takeScreenshot().then(function (png) {
-            writeScreenShot(png, 'exception.png');
+            writeScreenShot(png, 'test/e2e/screenshots/login_to_app_' + browser.browserName + '.png');
         });
         element(by.id('login')).sendKeys('bblier');
         browser.sleep(500);
@@ -21,15 +22,15 @@ describe('index resource page', function() {
         element(by.id('submit')).click();
     });
 
-    it('index a document whitout file', function() {
-        browser.sleep(4000);
+    it('index a document whitout file', function () {
+        browser.sleep(1000);
         browser.takeScreenshot().then(function (png) {
-            writeScreenShot(png, 'exception.png');
+            writeScreenShot(png, 'test/e2e/screenshots/home_' + browser.browserName + '.png');
         });
         element(by.id('indexing')).click();
         browser.sleep(500);
         browser.takeScreenshot().then(function (png) {
-            writeScreenShot(png, 'exception.png');
+            writeScreenShot(png, 'test/e2e/screenshots/index_a_document_' + browser.browserName + '.png');
         });
         element(by.id('doctype')).click();
         browser.sleep(500);
diff --git a/test/e2e/screenshots/.gitkeep b/test/e2e/screenshots/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
-- 
GitLab