browsertime 16.17.0 → 17.0.0-beta.1

package/lib/core/engine/command/mouse/clickAndHold.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.mouse');
-const webdriver = require('selenium-webdriver');
-
-class ClickAndHold {
+import intel from 'intel';
+import { By, Origin } from 'selenium-webdriver';
+const log = intel.getLogger('browsertime.command.mouse');
+export class ClickAndHold {
   constructor(browser) {
     this.driver = browser.getDriver();
     this.actions = this.driver.actions({ async: true });
@@ -17,12 +15,14 @@ class ClickAndHold {
    */
   async byXpath(xpath) {
     try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
+      const element = await this.driver.findElement(By.xpath(xpath));
       return this.actions.move({ origin: element }).press().perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not click and hold on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not click and hold on element with xpath ' + xpath);
+      log.verbose(error);
+      throw new Error(
+        'Could not click and hold on element with xpath ' + xpath
+      );
     }
   }
 
@@ -34,15 +34,15 @@ class ClickAndHold {
    */
   async bySelector(selector) {
     try {
-      const element = await this.driver.findElement(webdriver.By.css(selector));
+      const element = await this.driver.findElement(By.css(selector));
       return this.actions.move({ origin: element }).press().perform();
-    } catch (e) {
+    } catch (error) {
       log.error(
         'Could not click and hold on element with selector %s',
         selector
       );
-      log.verbose(e);
-      throw Error(
+      log.verbose(error);
+      throw new Error(
         'Could not click and hold on element with selector ' + selector
       );
     }
@@ -55,14 +55,11 @@ class ClickAndHold {
    */
   async atCursor() {
     try {
-      return this.actions
-        .move({ origin: webdriver.Origin.POINTER })
-        .press()
-        .perform();
-    } catch (e) {
+      return this.actions.move({ origin: Origin.POINTER }).press().perform();
+    } catch (error) {
       log.error('Could not click and hold at cursor');
-      log.verbose(e);
-      throw Error('Could not click and hold at cursor');
+      log.verbose(error);
+      throw new Error('Could not click and hold at cursor');
     }
   }
 
@@ -76,13 +73,13 @@ class ClickAndHold {
   async atPosition(xPos, yPos) {
     try {
       return this.actions
-        .move({ x: xPos, y: yPos, origin: webdriver.Origin.VIEWPORT })
+        .move({ x: xPos, y: yPos, origin: Origin.VIEWPORT })
         .press()
         .perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not click and hold at position (%d,%d)', xPos, yPos);
-      log.verbose(e);
-      throw Error(
+      log.verbose(error);
+      throw new Error(
         'Could not click and hold at position (' + xPos + ',' + yPos + ')'
       );
     }
@@ -96,12 +93,12 @@ class ClickAndHold {
    */
   async releaseAtXpath(xpath) {
     try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
+      const element = await this.driver.findElement(By.xpath(xpath));
       return this.actions.move({ origin: element }).release().perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not release on xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not release on xpath ' + xpath);
+      log.verbose(error);
+      throw new Error('Could not release on xpath ' + xpath);
     }
   }
 
@@ -113,12 +110,12 @@ class ClickAndHold {
    */
   async releaseAtSelector(selector) {
     try {
-      const element = await this.driver.findElement(webdriver.By.css(selector));
+      const element = await this.driver.findElement(By.css(selector));
       return this.actions.move({ origin: element }).release().perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not release on selector %s', selector);
-      log.verbose(e);
-      throw Error('Could not release on selector ' + selector);
+      log.verbose(error);
+      throw new Error('Could not release on selector ' + selector);
     }
   }
 
@@ -132,15 +129,15 @@ class ClickAndHold {
   async releaseAtPosition(xPos, yPos) {
     try {
       return this.actions
-        .move({ x: xPos, y: yPos, origin: webdriver.Origin.VIEWPORT })
+        .move({ x: xPos, y: yPos, origin: Origin.VIEWPORT })
         .release()
         .perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not release at position (%d,%d)', xPos, yPos);
-      log.verbose(e);
-      throw Error('Could not release at position (' + xPos + ',' + yPos + ')');
+      log.verbose(error);
+      throw new Error(
+        'Could not release at position (' + xPos + ',' + yPos + ')'
+      );
     }
   }
 }
-
-module.exports = ClickAndHold;

package/lib/core/engine/command/mouse/contextClick.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.mouse');
-const webdriver = require('selenium-webdriver');
-
-class ContextClick {
+import intel from 'intel';
+import { By } from 'selenium-webdriver';
+const log = intel.getLogger('browsertime.command.mouse');
+export class ContextClick {
   constructor(browser) {
     this.driver = browser.getDriver();
     this.actions = this.driver.actions({ async: true });
@@ -17,12 +15,12 @@ class ContextClick {
    */
   async byXpath(xpath) {
     try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
+      const element = await this.driver.findElement(By.xpath(xpath));
       return this.actions.contextClick(element).perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not context click on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not context click on element with xpath ' + xpath);
+      log.verbose(error);
+      throw new Error('Could not context click on element with xpath ' + xpath);
     }
   }
 
@@ -34,12 +32,14 @@ class ContextClick {
    */
   async bySelector(selector) {
     try {
-      const element = await this.driver.findElement(webdriver.By.css(selector));
+      const element = await this.driver.findElement(By.css(selector));
       return this.actions.contextClick(element).perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not context click on element with css %s', selector);
-      log.verbose(e);
-      throw Error('Could not context click on element with css ' + selector);
+      log.verbose(error);
+      throw new Error(
+        'Could not context click on element with css ' + selector
+      );
     }
   }
 
@@ -51,11 +51,10 @@ class ContextClick {
   async atCursor() {
     try {
       return this.actions.contextClick().perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not perform context click');
-      log.verbose(e);
-      throw Error('Could not perform context click');
+      log.verbose(error);
+      throw new Error('Could not perform context click');
     }
   }
 }
-module.exports = ContextClick;

package/lib/core/engine/command/mouse/doubleClick.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.mouse');
-const webdriver = require('selenium-webdriver');
-
-class DoubleClick {
+import intel from 'intel';
+import { By } from 'selenium-webdriver';
+const log = intel.getLogger('browsertime.command.mouse');
+export class DoubleClick {
   constructor(browser, pageCompleteCheck) {
     this.browser = browser;
     this.actions = this.browser.getDriver().actions({ async: true });
@@ -20,15 +18,15 @@ class DoubleClick {
     try {
       const element = await this.browser
         .getDriver()
-        .findElement(webdriver.By.xpath(xpath));
+        .findElement(By.xpath(xpath));
       await this.actions.doubleClick(element).perform();
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not double click on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not double click on element with xpath ' + xpath);
+      log.verbose(error);
+      throw new Error('Could not double click on element with xpath ' + xpath);
     }
   }
 
@@ -42,15 +40,17 @@ class DoubleClick {
     try {
       const element = await this.browser
         .getDriver()
-        .findElement(webdriver.By.css(selector));
+        .findElement(By.css(selector));
       await this.actions.doubleClick(element).perform();
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not double click on element with xpath %s', selector);
-      log.verbose(e);
-      throw Error('Could not double click on element with xpath ' + selector);
+      log.verbose(error);
+      throw new Error(
+        'Could not double click on element with xpath ' + selector
+      );
     }
   }
 
@@ -65,12 +65,10 @@ class DoubleClick {
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not perform double click');
-      log.verbose(e);
-      throw Error('Could not perform double click');
+      log.verbose(error);
+      throw new Error('Could not perform double click');
     }
   }
 }
-
-module.exports = DoubleClick;

package/lib/core/engine/command/mouse/index.js

@@ -1,9 +1,5 @@
-'use strict';
-
-module.exports = {
-  SingleClick: require('./singleClick'),
-  DoubleClick: require('./doubleClick'),
-  ClickAndHold: require('./clickAndHold'),
-  ContextClick: require('./contextClick'),
-  MouseMove: require('./mouseMove')
-};
+export { ClickAndHold } from './clickAndHold.js';
+export { DoubleClick } from './doubleClick.js';
+export { ContextClick } from './contextClick.js';
+export { SingleClick } from './singleClick.js';
+export { MouseMove } from './mouseMove.js';

package/lib/core/engine/command/mouse/mouseMove.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.mouse');
-const webdriver = require('selenium-webdriver');
-
-class MouseMove {
+import intel from 'intel';
+import { By, Origin } from 'selenium-webdriver';
+const log = intel.getLogger('browsertime.command.mouse');
+export class MouseMove {
   constructor(browser) {
     this.driver = browser.getDriver();
     this.actions = this.driver.actions({ async: true });
@@ -17,12 +15,12 @@ class MouseMove {
    */
   async byXpath(xpath) {
     try {
-      const element = await this.driver.findElement(webdriver.By.xpath(xpath));
+      const element = await this.driver.findElement(By.xpath(xpath));
       return this.actions.move({ origin: element }).perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not find element by xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not find element by xpath ' + xpath);
+      log.verbose(error);
+      throw new Error('Could not find element by xpath ' + xpath);
     }
   }
 
@@ -34,12 +32,12 @@ class MouseMove {
    */
   async bySelector(selector) {
     try {
-      const element = await this.driver.findElement(webdriver.By.css(selector));
+      const element = await this.driver.findElement(By.css(selector));
       return this.actions.move({ origin: element }).perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not find element by selector %s', selector);
-      log.verbose(e);
-      throw Error('Could not find element by selector ' + selector);
+      log.verbose(error);
+      throw new Error('Could not find element by selector ' + selector);
     }
   }
 
@@ -52,10 +50,10 @@ class MouseMove {
   async toPosition(xPos, yPos) {
     try {
       return this.actions.move({ x: xPos, y: yPos }).perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not move mouse to position.');
-      log.verbose(e);
-      throw Error('Could not move mouse to position.');
+      log.verbose(error);
+      throw new Error('Could not move mouse to position.');
     }
   }
 
@@ -68,14 +66,12 @@ class MouseMove {
   async byOffset(xOffset, yOffset) {
     try {
       return this.actions
-        .move({ x: xOffset, y: yOffset, origin: webdriver.Origin.POINTER })
+        .move({ x: xOffset, y: yOffset, origin: Origin.POINTER })
         .perform();
-    } catch (e) {
+    } catch (error) {
       log.error('Could not move mouse by offset');
-      log.verbose(e);
-      throw Error('Could not move mouse by offset');
+      log.verbose(error);
+      throw new Error('Could not move mouse by offset');
     }
   }
 }
-
-module.exports = MouseMove;

package/lib/core/engine/command/mouse/singleClick.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.mouse');
-const webdriver = require('selenium-webdriver');
-
-class SingleClick {
+import intel from 'intel';
+import { By } from 'selenium-webdriver';
+const log = intel.getLogger('browsertime.command.mouse');
+export class SingleClick {
   constructor(browser, pageCompleteCheck) {
     this.browser = browser;
     this.actions = this.browser.getDriver().actions({ async: true });
@@ -20,15 +18,15 @@ class SingleClick {
     try {
       const element = await this.browser
         .getDriver()
-        .findElement(webdriver.By.xpath(xpath));
+        .findElement(By.xpath(xpath));
       await this.actions.click(element).perform();
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not single click on element with xpath %s', xpath);
-      log.verbose(e);
-      throw Error('Could not single click on element with xpath ' + xpath);
+      log.verbose(error);
+      throw new Error('Could not single click on element with xpath ' + xpath);
     }
   }
 
@@ -42,15 +40,15 @@ class SingleClick {
     try {
       const element = await this.browser
         .getDriver()
-        .findElement(webdriver.By.css(selector));
+        .findElement(By.css(selector));
       await this.actions.click(element).perform();
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not single click on element with selector %s', selector);
-      log.verbose(e);
-      throw Error(
+      log.verbose(error);
+      throw new Error(
         'Could not single click on element with selector ' + selector
       );
     }
@@ -68,12 +66,10 @@ class SingleClick {
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not perform single click');
-      log.verbose(e);
-      throw Error('Could not perform single click');
+      log.verbose(error);
+      throw new Error('Could not perform single click');
     }
   }
 }
-
-module.exports = SingleClick;

package/lib/core/engine/command/navigation.js

@@ -1,8 +1,7 @@
-'use strict';
+import intel from 'intel';
+const log = intel.getLogger('browsertime.command.navigation');
 
-const log = require('intel').getLogger('browsertime.command.navigation');
-
-class Navigation {
+export default class Navigation {
   constructor(browser, pageCompleteCheck) {
     this.browser = browser;
     this.pageCompleteCheck = pageCompleteCheck;
@@ -18,10 +17,10 @@ class Navigation {
       if (options && 'wait' in options && options.wait == true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not navigate back');
-      log.verbose(e);
-      throw Error(`Could not navigate back`);
+      log.verbose(error);
+      throw new Error(`Could not navigate back`);
     }
   }
 
@@ -35,10 +34,10 @@ class Navigation {
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not navigate forward');
-      log.verbose(e);
-      throw Error(`Could not navigate forward`);
+      log.verbose(error);
+      throw new Error(`Could not navigate forward`);
     }
   }
 
@@ -52,11 +51,10 @@ class Navigation {
       if (options && 'wait' in options && options.wait === true) {
         return this.browser.extraWait(this.pageCompleteCheck);
       }
-    } catch (e) {
+    } catch (error) {
       log.error('Could not refresh page');
-      log.verbose(e);
-      throw Error(`Could not refresh page`);
+      log.verbose(error);
+      throw new Error(`Could not refresh page`);
     }
   }
 }
-module.exports = Navigation;

package/lib/core/engine/command/screenshot.js

@@ -1,6 +1,4 @@
-'use strict';
-
-class Screenshot {
+export default class Screenshot {
   constructor(screenshotManager, browser, index) {
     this.screenshotManager = screenshotManager;
     this.browser = browser;
@@ -15,4 +13,3 @@ class Screenshot {
     return this.screenshotManager.save(name, screenshot, url, this.index);
   }
 }
-module.exports = Screenshot;

package/lib/core/engine/command/scroll.js

@@ -1,9 +1,7 @@
-'use strict';
-
-const log = require('intel').getLogger('browsertime.command.scroll');
-
+import intel from 'intel';
+const log = intel.getLogger('browsertime.command.scroll');
 const delay = ms => new Promise(res => setTimeout(res, ms));
-class Scroll {
+export default class Scroll {
   constructor(browser, options) {
     this.browser = browser;
     this.options = options;
@@ -30,7 +28,7 @@ class Scroll {
       log.error(
         'scroll.byLines is only supported in Firefox. Please use scroll.byPixels instead.'
       );
-      throw Error(
+      throw new Error(
         'scroll.byLines is only supported in Firefox. Please use scroll.byPixels instead.'
       );
     }
@@ -76,4 +74,3 @@ class Scroll {
     }
   }
 }
-module.exports = Scroll;

package/lib/core/engine/command/select.js

@@ -1,8 +1,7 @@
-'use strict';
+import intel from 'intel';
+const log = intel.getLogger('browsertime.command.select');
 
-const log = require('intel').getLogger('browsertime.command.select');
-
-class Select {
+export default class Select {
   constructor(browser) {
     this.browser = browser;
   }
@@ -19,10 +18,10 @@ class Select {
     try {
       const script = `const select = document.getElementById('${selectId}'); select.value = '${value}'; select.dispatchEvent(new Event('change'));`;
       await this.browser.runScript(script, 'CUSTOM');
-    } catch (e) {
+    } catch (error) {
       log.error('Could not select value for select with id %s', selectId);
-      log.verbose(e);
-      throw Error(`Could not select value for select with id ${selectId}`);
+      log.verbose(error);
+      throw new Error(`Could not select value for select with id ${selectId}`);
     }
   }
 
@@ -38,10 +37,12 @@ class Select {
     try {
       const script = `const select = document.querySelector("select[name='${selectName}']"); select.value = '${value}'; select.dispatchEvent(new Event('change'));`;
       await this.browser.runScript(script, 'CUSTOM');
-    } catch (e) {
+    } catch (error) {
       log.error('Could not select value for select with name %s', selectName);
-      log.verbose(e);
-      throw Error(`Could not select value for select with name ${selectName}`);
+      log.verbose(error);
+      throw new Error(
+        `Could not select value for select with name ${selectName}`
+      );
     }
   }
 
@@ -58,13 +59,13 @@ class Select {
       const script = `const select = document.getElementById('${selectId}'); select.selectedIndex = ${index};select.dispatchEvent(new Event('change'));`;
       const value = await this.browser.runScript(script, 'CUSTOM');
       return value;
-    } catch (e) {
+    } catch (error) {
       log.error(
         'Could not select value for select with id %s by index',
         selectId
       );
-      log.verbose(e);
-      throw Error(`Could not select value for select with id ${selectId}`);
+      log.verbose(error);
+      throw new Error(`Could not select value for select with id ${selectId}`);
     }
   }
 
@@ -81,13 +82,13 @@ class Select {
       const script = `const select = document.querySelector("select[name='${selectName}']"); select.selectedIndex = ${index};select.dispatchEvent(new Event('change'));`;
       const value = await this.browser.runScript(script, 'CUSTOM');
       return value;
-    } catch (e) {
+    } catch (error) {
       log.error(
         'Could not select value for select with name %s by index',
         selectName
       );
-      log.verbose(e);
-      throw Error(`Could not select value for select name ${selectName}`);
+      log.verbose(error);
+      throw new Error(`Could not select value for select name ${selectName}`);
     }
   }
 
@@ -102,10 +103,10 @@ class Select {
       const script = `const select = document.getElementById('${selectId}'); select.selectedIndex = -1;select.dispatchEvent(new Event('change'));`;
       const value = await this.browser.runScript(script, 'CUSTOM');
       return value;
-    } catch (e) {
+    } catch (error) {
       log.error('Could not deleselect by select id %s', selectId);
-      log.verbose(e);
-      throw Error(`Could not deleselect by select id  ${selectId}`);
+      log.verbose(error);
+      throw new Error(`Could not deleselect by select id  ${selectId}`);
     }
   }
 
@@ -127,10 +128,10 @@ class Select {
     try {
       const value = await this.browser.runScript(script, 'CUSTOM');
       return value;
-    } catch (e) {
+    } catch (error) {
       log.error('Could not get select options for id %s', selectId);
-      log.verbose(e);
-      throw Error(`Could not get select options for id ${selectId}`);
+      log.verbose(error);
+      throw new Error(`Could not get select options for id ${selectId}`);
     }
   }
 
@@ -145,11 +146,10 @@ class Select {
       const script = `const select = document.getElementById('${selectId}'); return select.options[select.selectedIndex].value;`;
       const value = await this.browser.runScript(script, 'CUSTOM');
       return value;
-    } catch (e) {
+    } catch (error) {
       log.error('Could not select value for select with id %s', selectId);
-      log.verbose(e);
-      throw Error(`Could not select value for select with id ${selectId}`);
+      log.verbose(error);
+      throw new Error(`Could not select value for select with id ${selectId}`);
     }
   }
 }
-module.exports = Select;