cleaner code and try to fix the automatic opening of the report

Signed-off-by: Andrea Briganti <andrea.briganti@nttdata.com>

Author: Andrea Briganti

package.json

@@ -43,7 +43,7 @@
     "chromedriver": "^2.41.0",
     "commander": "2.9.0",
     "cucumber": "1.3.3",
-    "cucumber-html-reporter": "2.0.3",
+    "cucumber-html-reporter": "4.0.4",
     "cucumber-junit": "1.6.0",
     "electron": "^1.7.6",
     "electron-chromedriver": "^1.7.1",

runtime/helpers.js

@@ -259,5 +259,17 @@ module.exports = {
         }
 
         return driver.executeScript(getAfterContentValue, cssSelector);
+    },
+
+    clearCookies: function() {
+        return driver.manage().deleteAllCookies();
+    },
+
+    clearStorages: function() {
+        return driver.executeScript('window.localStorage.clear(); window.sessionStorage.clear();')
+    },
+
+    clearCookiesAndStorages: function() {
+        return helpers.clearCookies().then(helpers.clearStorages());
     }
 };

runtime/world.js

@@ -168,20 +168,23 @@ function importSupportObjects() {
     global.helpers = require('../runtime/helpers.js');
 }
 
-function teardownBrowser(driver) {
+function closeBrowser() {
+    // firefox quits on driver.close on the last window
+    return driver.close().then(function () {
+        if (browserName !== 'firefox'){
+            return driver.quit();
+        }
+    });
+}
+
+function teardownBrowser() {
     switch (browserTeardownStrategy) {
         case 'none':
-            return new Promise(
-                 function(resolve, reject) {});
+            return Promise.resolve();
         case 'clear':
-            return driver.manage().deleteAllCookies();
+            return helpers.clearCookiesAndStorages();
         default:
-            // firefox quits on driver.close on the last window
-            return driver.close().then(function () {
-                if (browserName !== 'firefox'){
-                    return driver.quit();
-                }
-            });
+            return closeBrowser(driver);
     }
 }
 
@@ -235,18 +238,11 @@ module.exports = function () {
             fs.writeFileSync(junitOutputPath, xmlReport);
         }
 
-        console.log(browserTeardownStrategy);
-
         if (browserTeardownStrategy !== 'always') {
-            driver.close().then(function () {
-                if (browserName !== 'firefox'){
-                    return driver.quit();
-                }
-                done();
-            });
+            closeBrowser().then(() => done());
         }
         else {
-            done();
+            new Promise(() => {}).then(() => done());
         }
     });
 
@@ -258,16 +254,14 @@ module.exports = function () {
 
                 scenario.attach(new Buffer(screenShot, 'base64'), 'image/png');
 
-                teardownBrowser(driver).then(function() {
+                return teardownBrowser().then(function() {
                     if (eyes) {
                         // If the test was aborted before eyes.close was called ends the test as aborted.
                         return eyes.abortIfNotClosed();
                     }
-
-                    return Promise.resolve();
                 });
             });
         }
-        return teardownBrowser(driver);
+        return teardownBrowser();
     });
 };