Log browser name in steps #51

glacejs · Nov 1, 2018 · 671f3b6 · 671f3b6
1 parent 45ee76a
commit 671f3b6
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/steps/browser.js b/lib/steps/browser.js
@@ -242,7 +242,7 @@ var BrowserSteps = {
         opts.tryExisting = U.defVal(opts.tryExisting, false);
         this.webUrl = U.defVal(this.webUrl, CONF.web.url);
 
-        let name;
+        let name, isNewBrowser = false;
         if (!opts.tryExisting || !this.webdriver) {
             const webdriverConf = U.defVal(opts.webdriver, CONF.webdriver);
 
@@ -252,15 +252,17 @@ var BrowserSteps = {
                 `Browser name "${name}" is used already. Choose another.`).to.not.exist;
 
             this.webdriver = this.__wdio.remote(webdriverConf);
+            isNewBrowser = true;
         } else {
+            name = this._webdrivers().getKey(this.webdriver);
             if (await this.webdriver.session()) {
-                LOG.debug("Browser is launched already");
+                LOG.debug(`Browser "${name}" is launched already`);
                 return false;
             }
         }
 
-        allure.step("Launch browser via selenium");
-        LOG.info("Launching browser via selenium...");
+        allure.step(`Launch browser "${name}" via selenium`);
+        LOG.info(`Launching browser "${name}" via selenium...`);
 
         if (CONF.web.platform === "pc" &&
             this.webdriver.desiredCapabilities.browserName === "chrome") {
@@ -283,7 +285,7 @@ var BrowserSteps = {
 
         allure.pass();
 
-        if (name) this._webdrivers().push(this.webdriver, name);
+        if (isNewBrowser) this._webdrivers().push(this.webdriver, name);
         return true;
     },
 
@@ -413,6 +415,7 @@ var BrowserSteps = {
         opts.switchPrev = U.defVal(opts.switchPrev, true);
         opts.check = U.defVal(opts.check, true);
 
+        const name = this._webdrivers().getKey(this.webdriver);
         const webdriver = this.webdriver;
 
         if (opts.switchPrev) {
@@ -421,8 +424,8 @@ var BrowserSteps = {
             this.webdriver = this._webdrivers().top();
         }
 
-        allure.step("Close browser");
-        LOG.info("Closing browser...");
+        allure.step(`Close browser "${name}"`);
+        LOG.info(`Closing browser "${name}"...`);
 
         await webdriver.end();
         await this.pause(1, "webdriver process will be stopped");