Fix GH-1420 Issue/refactor helper functions (#1458)

* put helper functions in separate file following Paul's style in scratch-gui

* remove console statements

* address review comments, object destructuring

test/helpers/selenium-helpers.js

+const webdriver = require('selenium-webdriver');
+
+const driver = new webdriver.Builder()
+    .forBrowser('chrome')
+    .build();
+
+const {By, until} = webdriver;
+
+const findByXpath = (xpath) => {
+    return driver.wait(until.elementLocated(By.xpath(xpath), 5 * 1000));
+};
+
+const clickXpath = (xpath) => {
+    return findByXpath(xpath).then(el => el.click());
+};
+
+const clickText = (text) => {
+    return clickXpath(`//*[contains(text(), '${text}')]`);
+};
+
+const clickButton = (text) => {
+    return clickXpath(`//button[contains(text(), '${text}')]`);
+};
+
+const findByCss = (css) => {
+    return driver.wait(until.elementLocated(By.css(css), 1000 * 5));
+};
+
+const getLogs = (whitelist) => {
+    return driver.manage()
+        .logs()
+        .get('browser')
+        .then((entries) => {
+            return entries.filter((entry) => {
+                const message = entry.message;
+                for (let i = 0; i < whitelist.length; i++) {
+                    if (message.indexOf(whitelist[i]) !== -1) {
+                        // eslint-disable-next-line no-console
+                        // console.warn('Ignoring whitelisted error: ' + whitelist[i]);
+                        return false;
+                    } else if (entry.level !== 'SEVERE') {
+                        // eslint-disable-next-line no-console
+                        // console.warn('Ignoring non-SEVERE entry: ' + message);
+                        return false;
+                    }
+                    return true;
+                }
+            });
+        });
+};
+
+module.exports = {
+    webdriver,
+    By,
+    until,
+    driver,
+    clickXpath,
+    findByXpath,
+    clickText,
+    clickButton,
+    findByCss,
+    getLogs
+};

test/integration/smoke-testing/test_signing_in_and_my_stuff.js

@@ -5,34 +5,20 @@
  *
  */
 
+const {
+    clickText,
+    findByXpath,
+    clickXpath,
+    clickButton,
+    driver
+} = require('../../helpers/selenium-helpers.js');
+
 var username = process.env.SMOKE_USERNAME;
 var password = process.env.SMOKE_PASSWORD;
 
+
 var tap = require('tap');
 const test = tap.test;
-const webdriver = require('selenium-webdriver');
-const By = webdriver.By;
-const until = webdriver.until;
-
-const driver = new webdriver.Builder()
-    .forBrowser('chrome')
-    .build();
-
-const findByXpath = (xpath) => {
-    return driver.wait(until.elementLocated(By.xpath(xpath), 5 * 1000));
-};
-
-const clickXpath = (xpath) => {
-    return findByXpath(xpath).then(el => el.click());
-};
-
-const clickText = (text) => {
-    return clickXpath(`//*[contains(text(), '${text}')]`);
-};
-
-const clickButton = (text) => {
-    return clickXpath(`//button[contains(text(), '${text}')]`);
-};
 
 var rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 var url = rootUrl + '/users/anyuser';

test/integration/smoke-testing/test_signing_in_homepage.js

+/*
+ * Tests signing in according to smoke-tests at:
+ *
+ * https://github.com/LLK/scratchr2/wiki/Smoke-Testing-Test-Cases
+ *
+ */
+
+const {
+    clickText,
+    findByXpath,
+    clickXpath,
+    driver
+} = require('../../helpers/selenium-helpers.js');
+
 var username = process.env.SMOKE_USERNAME;
 var password = process.env.SMOKE_PASSWORD;
 
 var tap = require('tap');
 const test = tap.test;
-const webdriver = require('selenium-webdriver');
-const By = webdriver.By;
-const until = webdriver.until;
-
-const driver = new webdriver.Builder()
-    .forBrowser('chrome')
-    .build();
-
-const findByXpath = (xpath) => {
-    return driver.wait(until.elementLocated(By.xpath(xpath), 5 * 1000));
-};
-
-const clickXpath = (xpath) => {
-    return findByXpath(xpath).then(el => el.click());
-};
-
-const clickText = (text) => {
-    return clickXpath(`//*[contains(text(), '${text}')]`);
-};
 
 var rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 

test/integration/smoke-testing/test_statistics_page.js

+/*
+ * Tests stats page according to smoke-tests at:
+ *
+ * https://github.com/LLK/scratchr2/wiki/Smoke-Testing-Test-Cases
+ *
+ */
+
+const {
+    clickText,
+    findByXpath,
+    findByCss,
+    driver
+} = require('../../helpers/selenium-helpers.js');
+
 var tap = require('tap');
 const test = tap.test;
-const webdriver = require('selenium-webdriver');
-const By = webdriver.By;
-const until = webdriver.until;
-
-const driver = new webdriver.Builder()
-    .forBrowser('chrome')
-    .build();
-
-const findByXpath = (xpath) => {
-    return driver.wait(until.elementLocated(By.xpath(xpath), 1000 * 5));
-};
-
-const findByCss = (css) => {
-    return driver.wait(until.elementLocated(By.css(css), 1000 * 5));
-};
-
-const clickXpath = (xpath) => {
-    return findByXpath(xpath).then(el => el.click());
-};
-
-const clickText = (text) => {
-    return clickXpath(`//*[contains(text(), '${text}')]`);
-};
 
 tap.plan(2);