Extract test defaults into separate module

test/origin-add.js

@@ -1,37 +1,12 @@
 
 var t = require('assert')
+var defaults = require('./utils/defaults')
 
 
 module.exports = ({popup, advanced, content}) => {
 
   before(async () => {
-    // popup
-    await popup.bringToFront()
-    // defaults button
-    await popup.click('button:nth-of-type(2)')
-
-    // advanced
-    await advanced.bringToFront()
-
-    // remove origin
-    if (await advanced.evaluate(() => Object.keys(state.origins).length > 1)) {
-      // expand origin
-      if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-        await advanced.click('.m-list li:nth-of-type(2)')
-      }
-      await advanced.click('.m-list li:nth-of-type(2) .m-footer .m-button')
-    }
-
-    // add origin
-    await advanced.select('.m-select', 'http')
-    await advanced.type('[type=text]', 'localhost:3000')
-    await advanced.click('button')
-    await advanced.waitFor(200)
-
-    // expand origin
-    if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-      await advanced.click('.m-list li:nth-of-type(2)')
-    }
+    await defaults({popup, advanced, content})
   })
 
   describe('defaults', () => {

test/origin-csp.js

@@ -1,43 +1,12 @@
 
 var t = require('assert')
+var defaults = require('./utils/defaults')
 
 
 module.exports = ({extensions, popup, advanced, content}) => {
 
   before(async () => {
-    // popup
-    await popup.bringToFront()
-    // defaults button
-    await popup.click('button:nth-of-type(2)')
-
-    // advanced
-    await advanced.bringToFront()
-
-    // remove origin
-    if (await advanced.evaluate(() => Object.keys(state.origins).length > 1)) {
-      // expand origin
-      if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-        await advanced.click('.m-list li:nth-of-type(2)')
-      }
-      await advanced.click('.m-list li:nth-of-type(2) .m-footer .m-button')
-    }
-
-    // add origin
-    await advanced.select('.m-select', 'http')
-    await advanced.type('[type=text]', 'localhost:3000')
-    await advanced.click('button')
-    await advanced.waitFor(200)
-
-    // expand origin
-    if (!await advanced.evaluate(() =>
-      document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-      await advanced.click('.m-list li:nth-of-type(2)')
-    }
-
-    // enable header detection
-    if (!await advanced.evaluate(() => state.header)) {
-      await advanced.click('.m-switch')
-    }
+    await defaults({popup, advanced, content})
 
     // enable path matching
     await advanced.evaluate(() => {

test/origin-encoding.js

@@ -1,42 +1,12 @@
 
 var t = require('assert')
+var defaults = require('./utils/defaults')
 
 
 module.exports = ({popup, advanced, content}) => {
 
   before(async () => {
-    // popup
-    await popup.bringToFront()
-    // defaults button
-    await popup.click('button:nth-of-type(2)')
-
-    // advanced
-    await advanced.bringToFront()
-
-    // remove origin
-    if (await advanced.evaluate(() => Object.keys(state.origins).length > 1)) {
-      // expand origin
-      if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-        await advanced.click('.m-list li:nth-of-type(2)')
-      }
-      await advanced.click('.m-list li:nth-of-type(2) .m-footer .m-button')
-    }
-
-    // add origin
-    await advanced.select('.m-select', 'http')
-    await advanced.type('[type=text]', 'localhost:3000')
-    await advanced.click('button')
-    await advanced.waitFor(200)
-
-    // expand origin
-    if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-      await advanced.click('.m-list li:nth-of-type(2)')
-    }
-
-    // enable header detection
-    if (!await advanced.evaluate(() => state.header)) {
-      await advanced.click('.m-switch')
-    }
+    await defaults({popup, advanced, content})
 
     // enable path matching
     await advanced.evaluate(() => {

test/origin-match.js

@@ -1,37 +1,12 @@
 
 var t = require('assert')
+var defaults = require('./utils/defaults')
 
 
 module.exports = ({popup, advanced, content}) => {
 
   before(async () => {
-    // popup
-    await popup.bringToFront()
-    // defaults button
-    await popup.click('button:nth-of-type(2)')
-
-    // advanced
-    await advanced.bringToFront()
-
-    // remove origin
-    if (await advanced.evaluate(() => Object.keys(state.origins).length > 1)) {
-      // expand origin
-      if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-        await advanced.click('.m-list li:nth-of-type(2)')
-      }
-      await advanced.click('.m-list li:nth-of-type(2) .m-footer .m-button')
-    }
-
-    // add origin
-    await advanced.select('.m-select', 'http')
-    await advanced.type('[type=text]', 'localhost:3000')
-    await advanced.click('button')
-    await advanced.waitFor(200)
-
-    // expand origin
-    if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-      await advanced.click('.m-list li:nth-of-type(2)')
-    }
+    await defaults({popup, advanced, content})
   })
 
   describe('correct content-type + disabled header detection + disabled path matching', () => {

test/popup-options.js

@@ -1,31 +1,12 @@
 
 var t = require('assert')
+var defaults = require('./utils/defaults')
 
 
 module.exports = ({popup, advanced, content}) => {
 
   before(async () => {
-    await advanced.bringToFront()
-
-    // remove origin
-    if (await advanced.evaluate(() => Object.keys(state.origins).length > 1)) {
-      // expand origin
-      if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
-        await advanced.click('.m-list li:nth-of-type(2)')
-      }
-      await advanced.click('.m-list li:nth-of-type(2) .m-footer .m-button')
-    }
-
-    // add origin
-    await advanced.select('.m-select', 'http')
-    await advanced.type('[type=text]', 'localhost:3000')
-    await advanced.click('button')
-    await advanced.waitFor(200)
-
-    // enable header detection
-    if (!await advanced.evaluate(() => state.header)) {
-      await advanced.click('.m-switch')
-    }
+    await defaults({popup, advanced, content})
   })
 
   describe('button - raw/markdown', () => {

test/utils/defaults.js

@@ -0,0 +1,41 @@
+
+module.exports = async ({popup, advanced, content}) => {
+  // popup
+  await popup.bringToFront()
+  // defaults button
+  await popup.click('button:nth-of-type(2)')
+  await popup.waitFor(200)
+
+  // advanced
+  await advanced.bringToFront()
+
+  // enable header detection
+  if (!await advanced.evaluate(() => state.header)) {
+    await advanced.click('.m-switch')
+  }
+
+  // remove origin
+  if (await advanced.evaluate(() => Object.keys(state.origins).length > 1)) {
+    // expand origin
+    if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
+      await advanced.click('.m-list li:nth-of-type(2)')
+    }
+    await advanced.click('.m-list li:nth-of-type(2) .m-footer .m-button')
+  }
+
+  // add origin
+  await advanced.select('.m-select', 'http')
+  await advanced.type('[type=text]', 'localhost:3000')
+  await advanced.click('button')
+  await advanced.waitFor(200)
+
+  // expand origin
+  if (!await advanced.evaluate(() => document.querySelector('.m-list li:nth-of-type(2)').classList.contains('m-expanded'))) {
+    await advanced.click('.m-list li:nth-of-type(2)')
+  }
+
+  // content
+  await content.bringToFront()
+  await content.goto('about:blank')
+  await content.waitFor(200)
+}