codeceptjs 3.2.3 → 3.3.0-beta.4

package/lib/helper/Playwright.js

@@ -19,6 +19,7 @@ const {
   getNormalizedKeyAttributeValue,
   isModifierKey,
   clearString,
+  requireWithFallback,
 } = require('../utils');
 const {
   isColorProperty,
@@ -38,6 +39,9 @@ const popupStore = new Popup();
 const consoleLogStore = new Console();
 const availableBrowsers = ['chromium', 'webkit', 'firefox', 'electron'];
 
+const {
+  setRestartStrategy, restartsSession, restartsContext, restartsBrowser,
+} = require('./extras/PlaywrightRestartOpts');
 const { createValueEngine, createDisabledEngine } = require('./extras/PlaywrightPropEngine');
 
 /**
@@ -49,12 +53,18 @@ const { createValueEngine, createDisabledEngine } = require('./extras/Playwright
  *
  * This helper works with a browser out of the box with no additional tools required to install.
  *
- * Requires `playwright` package version ^1 to be installed:
+ * Requires `playwright` or `playwright-core` package version ^1 to be installed:
  *
  * ```
- * npm i playwright@^1 --save
+ * npm i playwright@^1.18 --save
+ * ```
+ * or
+ * ```
+ * npm i playwright-core@^1.18 --save
  * ```
  *
+ * Using playwright-core package, will prevent the download of browser binaries and allow connecting to an existing browser installation or for connecting to a remote one.
+ *
  * ## Configuration
  *
  * This helper should be configured in codecept.json or codecept.conf.js
@@ -62,15 +72,19 @@ const { createValueEngine, createDisabledEngine } = require('./extras/Playwright
  * * `url`: base url of website to be tested
  * * `browser`: a browser to test on, either: `chromium`, `firefox`, `webkit`, `electron`. Default: chromium.
  * * `show`: (optional, default: false) - show browser window.
- * * `restart`: (optional, default: true) - restart browser between tests.
+ * * `restart`: (optional, default: false) - restart strategy between tests. Possible values:
+ *   * 'context' or **false** - restarts [browser context](https://playwright.dev/docs/api/class-browsercontext) but keeps running browser. Recommended by Playwright team to keep tests isolated.
+ *   * 'browser' or **true** - closes browser and opens it again between tests.
+ *   * 'session' or 'keep' - keeps browser context and session, but cleans up cookies and localStorage between tests. The fastest option when running tests in windowed mode. Works with `keepCookies` and `keepBrowserState` options. This behavior was default before CodeceptJS 3.1
+ * * `timeout`: (optional, default: 1000) -  [timeout](https://playwright.dev/docs/api/class-page#page-set-default-timeout) in ms of all Playwright actions .
  * * `disableScreenshots`: (optional, default: false)  - don't save screenshot on failure.
  * * `emulate`: (optional, default: {}) launch browser in device emulation mode.
  * * `video`: (optional, default: false) enables video recording for failed tests; videos are saved into `output/videos` folder
  * * `trace`: (optional, default: false) record [tracing information](https://playwright.dev/docs/trace-viewer) with screenshots and snapshots.
  * * `fullPageScreenshots` (optional, default: false) - make full page screenshots on failure.
  * * `uniqueScreenshotNames`: (optional, default: false)  - option to prevent screenshot override if you have scenarios with the same name in different suites.
- * * `keepBrowserState`: (optional, default: false) - keep browser state between tests when `restart` is set to false.
- * * `keepCookies`: (optional, default: false) - keep cookies between tests when `restart` is set to false.
+ * * `keepBrowserState`: (optional, default: false) - keep browser state between tests when `restart` is set to 'session'.
+ * * `keepCookies`: (optional, default: false) - keep cookies between tests when `restart` is set to 'session'.
  * * `waitForAction`: (optional) how long to wait after click, doubleClick or PressKey actions in ms. Default: 100.
  * * `waitForNavigation`: (optional, default: 'load'). When to consider navigation succeeded. Possible options: `load`, `domcontentloaded`, `networkidle`. Choose one of those options is possible. See [Playwright API](https://github.com/microsoft/playwright/blob/main/docs/api.md#pagewaitfornavigationoptions).
  * * `pressKeyDelay`: (optional, default: '10'). Delay between key presses in ms. Used when calling Playwrights page.type(...) in fillField/appendField
@@ -235,7 +249,7 @@ class Playwright extends Helper {
   constructor(config) {
     super(config);
 
-    playwright = require('playwright');
+    playwright = requireWithFallback('playwright', 'playwright-core');
 
     // set defaults
     this.isRemoteBrowser = false;
@@ -259,8 +273,10 @@ class Playwright extends Helper {
       waitForAction: 100,
       waitForTimeout: 1000,
       pressKeyDelay: 10,
+      timeout: 1000,
       fullPageScreenshots: false,
       disableScreenshots: false,
+      ignoreLog: ['warning', 'log'],
       uniqueScreenshotNames: false,
       manualStart: false,
       getPageTimeout: 0,
@@ -270,6 +286,7 @@ class Playwright extends Helper {
       keepBrowserState: false,
       show: false,
       defaultPopupAction: 'accept',
+      use: { actionTimeout: 0 },
       ignoreHTTPSErrors: false, // Adding it here o that context can be set up to ignore the SSL errors
     };
 
@@ -297,6 +314,7 @@ class Playwright extends Helper {
 
   _setConfig(config) {
     this.options = this._validateConfig(config);
+    setRestartStrategy(this.options);
     this.playwrightOptions = {
       headless: !this.options.show,
       ...this._getOptionsForBrowser(config),
@@ -334,9 +352,9 @@ class Playwright extends Helper {
 
   static _checkRequirements() {
     try {
-      require('playwright');
+      requireWithFallback('playwright', 'playwright-core');
     } catch (e) {
-      return ['playwright@^1'];
+      return ['playwright@^1.18'];
     }
   }
 
@@ -353,7 +371,7 @@ class Playwright extends Helper {
   }
 
   _beforeSuite() {
-    if (!this.options.restart && !this.options.manualStart && !this.isRunning) {
+    if ((restartsSession() || restartsContext()) && !this.options.manualStart && !this.isRunning) {
       this.debugSection('Session', 'Starting singleton browser session');
       return this._startBrowser();
     }
@@ -371,7 +389,7 @@ class Playwright extends Helper {
       },
     });
 
-    if (this.options.restart && !this.options.manualStart) await this._startBrowser();
+    if (restartsBrowser() && !this.options.manualStart) await this._startBrowser();
     if (!this.isRunning && !this.options.manualStart) await this._startBrowser();
 
     this.isAuthenticated = false;
@@ -393,7 +411,9 @@ class Playwright extends Helper {
       if (this.storageState) contextOptions.storageState = this.storageState;
       if (this.options.userAgent) contextOptions.userAgent = this.options.userAgent;
       if (this.options.locale) contextOptions.locale = this.options.locale;
-      this.browserContext = await this.browser.newContext(contextOptions); // Adding the HTTPSError ignore in the context so that we can ignore those errors
+      if (!this.browserContext || !restartsSession()) {
+        this.browserContext = await this.browser.newContext(contextOptions); // Adding the HTTPSError ignore in the context so that we can ignore those errors
+      }
     }
 
     let mainPage;
@@ -421,7 +441,11 @@ class Playwright extends Helper {
       return;
     }
 
-    if (this.options.restart) {
+    if (restartsSession()) {
+      return refreshContextSession.bind(this)();
+    }
+
+    if (restartsBrowser()) {
       this.isRunning = false;
       return this._stopBrowser();
     }
@@ -443,11 +467,10 @@ class Playwright extends Helper {
     return this.browser;
   }
 
-  _afterSuite() {
-  }
+  _afterSuite() {}
 
-  _finishTest() {
-    if (!this.options.restart && this.isRunning) return this._stopBrowser();
+  async _finishTest() {
+    if ((restartsSession() || restartsContext()) && this.isRunning) return this._stopBrowser();
   }
 
   _session() {
@@ -506,16 +529,16 @@ class Playwright extends Helper {
   * First argument is a description of an action.
   * Second argument is async function that gets this helper as parameter.
   *
-  * { [`page`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-page.md), [`context`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browsercontext.md) [`browser`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browser.md) } objects from Playwright API are available.
+  * { [`page`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-page.md), [`browserContext`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browsercontext.md) [`browser`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browser.md) } objects from Playwright API are available.
   *
   * ```js
-  * I.usePlaywrightTo('emulate offline mode', async ({ context }) => {
-  *   await context.setOffline(true);
+  * I.usePlaywrightTo('emulate offline mode', async ({ browserContext }) => {
+  *   await browserContext.setOffline(true);
   * });
   * ```
   *
   * @param {string} description used to show in logs.
-  * @param {function} fn async functuion that executed with Playwright helper as argument
+  * @param {function} fn async function that executed with Playwright helper as argument
   */
   usePlaywrightTo(description, fn) {
     return this._useTo(...arguments);
@@ -583,7 +606,9 @@ class Playwright extends Helper {
     this._addPopupListener(page);
     this.page = page;
     if (!page) return;
+    this.browserContext.setDefaultTimeout(0);
     page.setDefaultNavigationTimeout(this.options.getPageTimeout);
+    page.setDefaultTimeout(this.options.timeout);
 
     page.on('crash', async () => {
       console.log('ERROR: Page has crashed, closing page!');
@@ -684,7 +709,6 @@ class Playwright extends Helper {
     this._setPage(null);
     this.context = null;
     popupStore.clear();
-
     await this.browser.close();
   }
 
@@ -826,9 +850,21 @@ class Playwright extends Helper {
 
   /**
    * {{> dragAndDrop }}
+   *
+   * [Additional options](https://playwright.dev/docs/api/class-page#page-drag-and-drop) can be passed as 3rd argument.
+   *
+   * ```js
+   * // specify coordinates for source position
+   * I.dragAndDrop('img.src', 'img.dst', { sourcePosition: {x: 10, y: 10} })
+   * ```
+   *
+   * > By default option `force: true` is set
    */
-  async dragAndDrop(srcElement, destElement) {
-    return proceedDragAndDrop.call(this, srcElement, destElement);
+  async dragAndDrop(srcElement, destElement, options = { force: true }) {
+    const src = new Locator(srcElement, 'css');
+    const dst = new Locator(destElement, 'css');
+
+    return this.page.dragAndDrop(buildLocatorString(src), buildLocatorString(dst), options);
   }
 
   /**
@@ -1168,10 +1204,21 @@ class Playwright extends Helper {
   /**
    * {{> click }}
    *
+   * [Additional options](https://playwright.dev/docs/api/class-page#page-click) for click available as 3rd argument.
+   *
+   * Examples:
+   *
+   * ```js
+   * // click on element at position
+   * I.click('canvas', '.model', { position: { x: 20, y: 40 } })
+   *
+   * // make ctrl-click
+   * I.click('.edit', null, { modifiers: ['Ctrl'] } )
+   * ```
    *
    */
-  async click(locator, context = null) {
-    return proceedClick.call(this, locator, context);
+  async click(locator, context = null, opts = {}) {
+    return proceedClick.call(this, locator, context, opts);
   }
 
   /**
@@ -1210,30 +1257,40 @@ class Playwright extends Helper {
 
   /**
    * {{> checkOption }}
+   *
+   * [Additional options](https://playwright.dev/docs/api/class-elementhandle#element-handle-check) for check available as 3rd argument.
+   *
+   * Examples:
+   *
+   * ```js
+   * // click on element at position
+   * I.checkOption('Agree', '.signup', { position: { x: 5, y: 5 } })
+   * ```
+   * > ⚠️ To avoid flakiness, option `force: true` is set by default
    */
-  async checkOption(field, context = null) {
+  async checkOption(field, context = null, options = { force: true }) {
     const elm = await this._locateCheckable(field, context);
-    const curentlyChecked = await elm.getProperty('checked')
-      .then(checkedProperty => checkedProperty.jsonValue());
-    // Only check if NOT currently checked
-    if (!curentlyChecked) {
-      await elm.click();
-      return this._waitForAction();
-    }
+    await elm.check(options);
+    return this._waitForAction();
   }
 
   /**
    * {{> uncheckOption }}
+   *
+   * [Additional options](https://playwright.dev/docs/api/class-elementhandle#element-handle-uncheck) for uncheck available as 3rd argument.
+   *
+   * Examples:
+   *
+   * ```js
+   * // click on element at position
+   * I.uncheckOption('Agree', '.signup', { position: { x: 5, y: 5 } })
+   * ```
+   * > ⚠️ To avoid flakiness, option `force: true` is set by default
    */
-  async uncheckOption(field, context = null) {
+  async uncheckOption(field, context = null, options = { force: true }) {
     const elm = await this._locateCheckable(field, context);
-    const curentlyChecked = await elm.getProperty('checked')
-      .then(checkedProperty => checkedProperty.jsonValue());
-    // Only uncheck if currently checked
-    if (curentlyChecked) {
-      await elm.click();
-      return this._waitForAction();
-    }
+    await elm.uncheck(options);
+    return this._waitForAction();
   }
 
   /**
@@ -1881,6 +1938,53 @@ class Playwright extends Helper {
     return this.page.screenshot({ path: outputFile, fullPage: fullPageOption, type: 'png' });
   }
 
+  /**
+   * Performs [api request](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get) using
+   * the cookies from the current browser session.
+   *
+   * ```js
+   * const users = await I.makeApiRequest('GET', '/api/users', { params: { page: 1 }});
+   * users[0]
+   * I.makeApiRequest('PATCH', )
+   * ```
+   *
+   * > This is Playwright's built-in alternative to using REST helper's sendGet, sendPost, etc methods.
+   *
+   * @param {string} method HTTP method
+   * @param {string} url endpoint
+   * @param {object} options request options depending on method used
+   * @returns {Promise<object>} response
+   */
+  async makeApiRequest(method, url, options) {
+    method = method.toLowerCase();
+    const allowedMethods = ['get', 'post', 'patch', 'head', 'fetch', 'delete'];
+    if (!allowedMethods.includes(method)) {
+      throw new Error(`Method ${method} is not allowed, use the one from a list ${allowedMethods} or switch to using REST helper`);
+    }
+
+    if (url.startsWith('/')) { // local url
+      url = this.options.url + url;
+      this.debugSection('URL', url);
+    }
+
+    const response = await this.page.request[method](url, options);
+    this.debugSection('Status', response.status());
+    this.debugSection('Response', await response.text());
+
+    // hook to allow JSON response handle this
+    if (this.config.onResponse) {
+      const axiosResponse = {
+        data: await response.json(),
+        status: response.status(),
+        statusText: response.statusText(),
+        headers: response.headers(),
+      };
+      this.config.onResponse(axiosResponse);
+    }
+
+    return response;
+  }
+
   async _failed(test) {
     await this._withinEnd();
 
@@ -2489,8 +2593,7 @@ async function findCheckable(locator, context) {
 async function proceedIsChecked(assertType, option) {
   let els = await findCheckable.call(this, option);
   assertElementExists(els, option, 'Checkable');
-  els = await Promise.all(els.map(el => el.getProperty('checked')));
-  els = await Promise.all(els.map(el => el.jsonValue()));
+  els = await Promise.all(els.map(el => el.isChecked()));
   const selected = els.reduce((prev, cur) => prev || cur);
   return truth(`checkable ${option}`, 'to be checked')[assertType](selected);
 }
@@ -2518,36 +2621,6 @@ async function findFields(locator) {
   return this._locate({ css: locator });
 }
 
-async function proceedDragAndDrop(sourceLocator, destinationLocator) {
-  // modern drag and drop in Playwright
-  if (this.page.dragAndDrop) {
-    const source = new Locator(sourceLocator);
-    const dest = new Locator(destinationLocator);
-    if (source.isBasic() && dest.isBasic()) {
-      return this.page.dragAndDrop(source.simplify(), dest.simplify());
-    }
-  }
-
-  const src = await this._locate(sourceLocator);
-  assertElementExists(src, sourceLocator, 'Source Element');
-
-  const dst = await this._locate(destinationLocator);
-  assertElementExists(dst, destinationLocator, 'Destination Element');
-
-  // Note: Using clickablePoint private api becaues the .BoundingBox does not take into account iframe offsets!
-  const dragSource = await clickablePoint(src[0]);
-  const dragDestination = await clickablePoint(dst[0]);
-
-  // Drag start point
-  await this.page.mouse.move(dragSource.x, dragSource.y, { steps: 5 });
-  await this.page.mouse.down();
-
-  // Drag destination
-  await this.page.mouse.move(dragDestination.x, dragDestination.y, { steps: 5 });
-  await this.page.mouse.up();
-  await this._waitForAction();
-}
-
 async function proceedSeeInField(assertType, field, value) {
   const els = await findFields.call(this, field);
   assertElementExists(els, field, 'Field');
@@ -2574,14 +2647,15 @@ async function proceedSeeInField(assertType, field, value) {
   };
 
   if (tag === 'SELECT') {
-    const selectedOptions = await el.$$('option:checked');
-    // locate option by values and check them
-    if (value === '') {
-      return proceedMultiple(selectedOptions);
+    if (await el.getProperty('multiple')) {
+      const selectedOptions = await el.$$('option:checked');
+      if (!selectedOptions.length) return null;
+
+      const options = await filterFieldsByValue(selectedOptions, value, true);
+      return proceedMultiple(options);
     }
 
-    const options = await filterFieldsByValue(selectedOptions, value, true);
-    return proceedMultiple(options);
+    return el.inputValue();
   }
 
   if (tag === 'INPUT') {
@@ -2597,7 +2671,8 @@ async function proceedSeeInField(assertType, field, value) {
     }
     return proceedMultiple(els[0]);
   }
-  const fieldVal = await el.getProperty('value').then(el => el.jsonValue());
+
+  const fieldVal = await el.inputValue();
   return stringIncludes(`fields by ${field}`)[assertType](value, fieldVal);
 }
 
@@ -2628,10 +2703,10 @@ async function filterFieldsBySelectionState(elements, state) {
 }
 
 async function elementSelected(element) {
-  const type = await element.getProperty('type').then(el => el.jsonValue());
+  const type = await element.getProperty('type').then(el => !!el && el.jsonValue());
 
   if (type === 'checkbox' || type === 'radio') {
-    return element.getProperty('checked').then(el => el.jsonValue());
+    return element.isChecked();
   }
   return element.getProperty('selected').then(el => el.jsonValue());
 }
@@ -2679,12 +2754,18 @@ async function targetCreatedHandler(page) {
       });
   });
   page.on('console', (msg) => {
-    this.debugSection(`Browser:${ucfirst(msg.type())}`, (msg.text && msg.text() || msg._text || '') + msg.args().join(' '));
+    if (!consoleLogStore.includes(msg) && this.options.ignoreLog && !this.options.ignoreLog.includes(msg.type())) {
+      this.debugSection(`Browser:${ucfirst(msg.type())}`, (msg.text && msg.text() || msg._text || '') + msg.args().join(' '));
+    }
     consoleLogStore.add(msg);
   });
 
   if (this.options.windowSize && this.options.windowSize.indexOf('x') > 0 && this._getType() === 'Browser') {
-    await page.setViewportSize(parseWindowSize(this.options.windowSize));
+    try {
+      await page.setViewportSize(parseWindowSize(this.options.windowSize));
+    } catch (err) {
+      // target can be already closed, ignoring...
+    }
   }
 }
 
@@ -2774,3 +2855,37 @@ async function clickablePoint(el) {
   } = rect;
   return { x: x + width / 2, y: y + height / 2 };
 }
+
+async function refreshContextSession() {
+  // close other sessions
+  try {
+    const contexts = await this.browser.contexts();
+    contexts.shift();
+
+    await Promise.all(contexts.map(c => c.close()));
+  } catch (e) {
+    console.log(e);
+  }
+
+  if (this.page) {
+    const existingPages = await this.browserContext.pages();
+    await this._setPage(existingPages[0]);
+  }
+
+  if (this.options.keepBrowserState) return;
+
+  if (!this.options.keepCookies) {
+    this.debugSection('Session', 'cleaning cookies and localStorage');
+    await this.clearCookie();
+  }
+  const currentUrl = await this.grabCurrentUrl();
+
+  if (currentUrl.startsWith('http')) {
+    await this.executeScript('localStorage.clear();').catch((err) => {
+      if (!(err.message.indexOf("Storage is disabled inside 'data:' URLs.") > -1)) throw err;
+    });
+    await this.executeScript('sessionStorage.clear();').catch((err) => {
+      if (!(err.message.indexOf("Storage is disabled inside 'data:' URLs.") > -1)) throw err;
+    });
+  }
+}

package/lib/helper/Puppeteer.js

@@ -22,6 +22,7 @@ const {
   screenshotOutputFolder,
   getNormalizedKeyAttributeValue,
   isModifierKey,
+  requireWithFallback,
 } = require('../utils');
 const {
   isColorProperty,
@@ -43,7 +44,15 @@ const consoleLogStore = new Console();
  * Browser control is executed via DevTools Protocol (instead of Selenium).
  * This helper works with a browser out of the box with no additional tools required to install.
  *
- * Requires `puppeteer` package to be installed.
+ * Requires `puppeteer` or `puppeteer-core` package to be installed.
+ * ```
+ * npm i puppeteer --save
+ * ```
+ * or
+ * ```
+ * npm i puppeteer-core --save
+ * ```
+ * Using `puppeteer-core` package, will prevent the download of browser binaries and allow connecting to an existing browser installation or for connecting to a remote one.
  *
  * > Experimental Firefox support [can be activated](https://codecept.io/helpers/Puppeteer-firefox).
  *
@@ -182,7 +191,7 @@ class Puppeteer extends Helper {
   constructor(config) {
     super(config);
 
-    puppeteer = require('puppeteer');
+    puppeteer = requireWithFallback('puppeteer', 'puppeteer-core');
 
     // set defaults
     this.isRemoteBrowser = false;
@@ -245,7 +254,7 @@ class Puppeteer extends Helper {
 
   static _checkRequirements() {
     try {
-      require('puppeteer');
+      requireWithFallback('puppeteer', 'puppeteer-core');
     } catch (e) {
       return ['puppeteer'];
     }

package/lib/helper/REST.js

@@ -63,6 +63,12 @@ class REST extends Helper {
     this.axios.defaults.headers = this.options.defaultHeaders;
   }
 
+  static _config() {
+    return [
+      { name: 'endpoint', message: 'Endpoint of API you are going to test', default: 'http://localhost:3000/api' },
+    ];
+  }
+
   static _checkRequirements() {
     try {
       require('axios');
@@ -71,6 +77,33 @@ class REST extends Helper {
     }
   }
 
+  _before() {
+    this.headers = { ...this.options.defaultHeaders };
+  }
+
+  /**
+   * Sets request headers for all requests of this test
+   *
+   * @param {object} headers headers list
+   */
+  haveRequestHeaders(headers) {
+    this.headers = { ...headers, ...this.headers };
+  }
+
+  /**
+   * Adds a header for Bearer authentication
+   *
+   * ```js
+   * // we use secret function to hide token from logs
+   * I.amBearerAuthenticated(secret('heregoestoken'))
+   * ```
+   *
+   * @param {string} accessToken  Bearer access token
+   */
+  amBearerAuthenticated(accessToken) {
+    this.haveRequestHeaders({ Authorization: `Bearer ${accessToken}` });
+  }
+
   /**
    * Executes axios request
    *
@@ -111,6 +144,9 @@ class REST extends Helper {
       this.debugSection('Response', `Response error. Status code: ${err.response.status}`);
       response = err.response;
     }
+    if (this.config.onResponse) {
+      await this.config.onResponse(response);
+    }
     this.debugSection('Response', JSON.stringify(response.data));
     return response;
   }

package/lib/helper/extras/Console.js

@@ -14,6 +14,14 @@ class Console {
     this._logEntries = [];
   }
 
+  includes(msg) {
+    const prev = this._logEntries[this._logEntries.length - 1];
+    if (!prev) return false;
+    const text = msg.text && msg.text() || msg._text || '';
+    const prevText = prev.text && prev.text() || prev._text || '';
+    return text === prevText;
+  }
+
   add(entry) {
     if (Array.isArray(entry)) {
       this._logEntries = this._logEntries.concat(entry);

package/lib/helper/extras/PlaywrightRestartOpts.js

@@ -0,0 +1,35 @@
+const RESTART_OPTS = {
+  session: 'keep',
+  browser: true,
+  context: false,
+};
+
+let restarts = null;
+
+module.exports = {
+
+  setRestartStrategy(options) {
+    const { restart } = options;
+    const stringOpts = Object.keys(RESTART_OPTS);
+
+    if (stringOpts.includes(restart)) {
+      return restarts = restart;
+    }
+
+    restarts = Object.keys(RESTART_OPTS).find(key => RESTART_OPTS[key] === restart);
+
+    console.log(restarts);
+
+    if (restarts === null || restarts === undefined) throw new Error('No restart strategy set, use the following values for restart: session, context, browser');
+  },
+
+  restartsSession() {
+    return restarts === 'session';
+  },
+  restartsContext() {
+    return restarts === 'context';
+  },
+  restartsBrowser() {
+    return restarts === 'browser';
+  },
+};

package/lib/interfaces/bdd.js

@@ -25,7 +25,8 @@ const parameterTypeRegistry = new ParameterTypeRegistry();
 const matchStep = (step) => {
   for (const stepName in steps) {
     if (stepName.indexOf('/') === 0) {
-      const res = step.match(new RegExp(stepName.slice(1, -1)));
+      const regExpArr = stepName.match(new RegExp('^/(.*?)/([gimy]*)$')) || [];
+      const res = step.match(new RegExp(regExpArr[1], regExpArr[2]));
       if (res) {
         const fn = steps[stepName];
         fn.params = res.slice(1);
@@ -56,6 +57,7 @@ module.exports = {
   Given: addStep,
   When: addStep,
   Then: addStep,
+  And: addStep,
   matchStep,
   getSteps,
   clearSteps,