Use a single browser instance per suite for Protractor/Selenium helper

docs/helpers.md

@@ -149,6 +149,8 @@ Implement corresponding methods to them.
 * `_before` - before a test
 * `_beforeStep` - before each step
 * `_afterStep` - after each step
+* `_beforeSuite` - before each suite (Protractor and SeleniumWebdriver only)
+* `_afterSuite` - after each suite (Protractor and SeleniumWebdriver only)
 
 Each implemented method should return a value as they will be added to global promise chain as well.
 

lib/helper.js

@@ -81,6 +81,24 @@ class Helper {
 
   }
 
+  /**
+   * Hook executed before each suite
+   *
+   * @param suite
+   */
+  _beforeSuite() {
+
+  }
+
+  /**
+   * Hook executed after each suite
+   *
+   * @param suite
+   */
+  _afterSuite() {
+
+  }
+
   /**
    * Access another configured helper: `this.helpers['AnotherHelper']`
    */

lib/helper/Protractor.js

@@ -112,13 +112,17 @@ class Protractor extends SeleniumWebdriver {
   }
 
   _before() {
-    this.browser = this.driverProvider.getNewDriver();
     this.amInsideAngularApp();
     this.context = this.options.rootElement;
     return this.browser;
   }
 
-  _after() {
+  _beforeSuite() {
+    this.browser = this.driverProvider.getNewDriver();
+    return this.browser;
+  }
+
+  _afterSuite() {
     return this.browser.quit();
   }
 

lib/helper/SeleniumWebdriver.js

@@ -101,11 +101,12 @@ class SeleniumWebdriver extends Helper {
     ];
   }
 
-  _before() {
-    return this.browser = this.browserBuilder.build();
+  _beforeSuite() {
+    this.browser = this.browserBuilder.build();
+    return this.browser;
   }
 
-  _after() {
+  _afterSuite() {
     return this.browser.quit();
   }
 

lib/interfaces/codeceptjs.js

@@ -22,20 +22,10 @@ var escapeRe = require('escape-string-regexp');
  */
 module.exports = function (suite) {
   var suites = [suite];
-
 
   suite.on('pre-require', function (context, file, mocha) {
     var common = require('mocha/lib/interfaces/common')(suites, context);
 
-    common.before('codeceptjs event', function () {
-      event.dispatcher.emit(event.suite.before);
-    });
-
-    common.after('codeceptjs event', function () {
-      event.dispatcher.emit(event.suite.after);
-    });
-
-
     // create dispatcher
 
     context.BeforeAll = common.before;
@@ -48,16 +38,22 @@ module.exports = function (suite) {
      * and/or tests.
      */
 
-    context.Feature = function (title) { 
+    context.Feature = function (title) {
       if (suites.length > 1) {
         suites.shift();
-      }          
+      }
       var suite = Suite.create(suites[0], title);
       suite.file = file;
       suite.timeout(0);
       suites.unshift(suite);
       suite.beforeEach('codeceptjs.before', scenario.setup);
-      suite.afterEach('finialize codeceptjs', scenario.teardown);     
+      suite.afterEach('finialize codeceptjs', scenario.teardown);
+      suite.beforeAll('codeceptjs.beforeSuite', function() {
+        event.dispatcher.emit(event.suite.before, suite);
+      });
+      suite.afterAll('codeceptjs.afterSuite', function() {
+        event.dispatcher.emit(event.suite.after, suite);
+      });
       return suite;
     };
 

lib/listener/helpers.js

@@ -24,6 +24,14 @@ event.dispatcher.on(event.all.before, function () {
   runHelpersHook('_init');
 });
 
+event.dispatcher.on(event.suite.before, function () {
+  runHelpersHook('_beforeSuite');
+});
+
+event.dispatcher.on(event.suite.after, function () {
+  runHelpersHook('_afterSuite');
+});
+
 event.dispatcher.on(event.test.before, function () {
   runAsyncHelpersHook('_before');
 });

test/unit/helper/Nightmare_test.js

@@ -93,4 +93,4 @@ describe('Nightmare', function () {
     });
   });
 
-});
+});

test/unit/helper/Protractor_test.js

@@ -33,6 +33,11 @@ describe('Protractor', function() {
     global.codecept_dir = path.join(__dirname, '../../data');
     I = new Protractor({url: site_url});
     I._init();
+    I._beforeSuite();
+  });
+
+  after(() => {
+    return I._afterSuite();
   });
 
   beforeEach(() => {
@@ -439,4 +444,4 @@ describe('Protractor', function() {
         });
     });
   });
-});
+});

test/unit/helper/SeleniumWebdriver_test.js

@@ -27,15 +27,15 @@ describe('SeleniumWebdriver', function () {
       browser: 'firefox'
     });
     I._init();
+    browser = I._beforeSuite();
   });
 
-  beforeEach(function() {
-    webApiTests.init({ I, site_url});
-    return browser = I._before();
+  after(function() {
+    I._afterSuite();
   });
 
-  afterEach(() => {
-    return I._after();
+  beforeEach(function() {
+    webApiTests.init({ I, site_url});
   });
 
   describe('open page : #amOnPage', () => {
@@ -106,4 +106,4 @@ describe('SeleniumWebdriver', function () {
     });
   });
 
-});
+});