diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/accessibility-helpers.js b/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/accessibility-helpers.js index 4ea51d1c45f6..5b453b7af01b 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/accessibility-helpers.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/accessibility-helpers.js @@ -5,7 +5,7 @@ "use strict"; const Services = require("Services"); -const { openToolboxAndLog, reloadPageAndLog } = require("../head"); +const { openToolboxAndLog, reloadPageAndLog } = require("damp-test/tests/head"); const INITIALIZED_EVENT = "Accessibility:Initialized"; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/cold-open.js b/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/cold-open.js index cb78a515987a..d5037f3ce71d 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/cold-open.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/cold-open.js @@ -7,14 +7,14 @@ const { openAccessibilityAndLog, shutdownAccessibilityService, -} = require("./accessibility-helpers"); +} = require("damp-test/tests/accessibility/accessibility-helpers"); const { closeToolbox, testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/simple.js b/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/simple.js index 03023fac7b82..78ccf6996142 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/simple.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/accessibility/simple.js @@ -8,13 +8,13 @@ const { openAccessibilityAndLog, reloadAccessibilityAndLog, shutdownAccessibilityService, -} = require("./accessibility-helpers"); +} = require("damp-test/tests/accessibility/accessibility-helpers"); const { closeToolboxAndLog, testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/cold-open.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/cold-open.js index ce614a1a4eb1..2e501fccce7a 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/cold-open.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/cold-open.js @@ -10,7 +10,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); // This simple test is only called once using the flag coldRun module.exports = async function() { diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/complicated.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/complicated.js index 87520d4adcdf..22a04b56dd96 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/complicated.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/complicated.js @@ -4,14 +4,16 @@ "use strict"; -const { reloadInspectorAndLog } = require("./inspector-helpers"); +const { + reloadInspectorAndLog, +} = require("damp-test/tests/inspector/inspector-helpers"); const { openToolboxAndLog, closeToolboxAndLog, testSetup, testTeardown, COMPLICATED_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(COMPLICATED_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js index 08de98f4408c..cf7c83658f34 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/custom.js @@ -7,7 +7,7 @@ const { reloadInspectorAndLog, selectNodeFront, -} = require("./inspector-helpers"); +} = require("damp-test/tests/inspector/inspector-helpers"); const { closeToolboxAndLog, garbageCollect, @@ -16,7 +16,7 @@ const { testSetup, testTeardown, PAGES_BASE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); const { gDevTools } = require("devtools/client/framework/devtools"); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/inspector-helpers.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/inspector-helpers.js index 3dd8992df85e..db6ca2be68ce 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/inspector-helpers.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/inspector-helpers.js @@ -4,7 +4,7 @@ "use strict"; -const { reloadPageAndLog } = require("../head"); +const { reloadPageAndLog } = require("damp-test/tests/head"); exports.reloadInspectorAndLog = async function(label, toolbox) { let onReload = async function() { diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/layout.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/layout.js index 924fe7c6cba2..f75342fd3bed 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/layout.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/layout.js @@ -13,7 +13,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { let tab = await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/mutations.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/mutations.js index ebf8d7e21a43..fd2abadc36ac 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/mutations.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/mutations.js @@ -11,7 +11,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); /** * Measure the time necessary to perform successive childList mutations in the content diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/simple.js b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/simple.js index bce5fefbf642..5ca673a4a677 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/inspector/simple.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/inspector/simple.js @@ -4,14 +4,16 @@ "use strict"; -const { reloadInspectorAndLog } = require("./inspector-helpers"); +const { + reloadInspectorAndLog, +} = require("damp-test/tests/inspector/inspector-helpers"); const { openToolboxAndLog, closeToolboxAndLog, testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/cold-open.js b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/cold-open.js index 141b15589463..a25608e677b0 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/cold-open.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/cold-open.js @@ -10,7 +10,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/complicated.js b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/complicated.js index 301db54bbcaa..56b5a6d23bff 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/complicated.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/complicated.js @@ -11,12 +11,12 @@ const { testSetup, testTeardown, COMPLICATED_URL, -} = require("../head"); +} = require("damp-test/tests/head"); const { exportHar, waitForNetworkRequests, openResponseDetailsPanel, -} = require("./netmonitor-helpers"); +} = require("damp-test/tests/netmonitor/netmonitor-helpers"); const EXPECTED_REQUESTS = { min: 230, diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/netmonitor-helpers.js b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/netmonitor-helpers.js index a1790f6e90ee..902ca5d7a49c 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/netmonitor-helpers.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/netmonitor-helpers.js @@ -6,7 +6,7 @@ const { EVENTS } = require("devtools/client/netmonitor/src/constants"); const Actions = require("devtools/client/netmonitor/src/actions/index"); -const { getToolbox, runTest } = require("../head"); +const { getToolbox, runTest } = require("damp-test/tests/head"); /** * Start monitoring all incoming update events about network requests and wait until diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/simple.js b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/simple.js index e84e820225c0..3db0b72687ff 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/simple.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/netmonitor/simple.js @@ -11,8 +11,11 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); -const { exportHar, waitForNetworkRequests } = require("./netmonitor-helpers"); +} = require("damp-test/tests/head"); +const { + exportHar, + waitForNetworkRequests, +} = require("damp-test/tests/netmonitor/netmonitor-helpers"); const EXPECTED_REQUESTS = 1; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/server/actor.js b/testing/talos/talos/tests/devtools/addon/content/tests/server/actor.js index 47ea88e97735..c95401edf16e 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/server/actor.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/server/actor.js @@ -6,7 +6,7 @@ const protocol = require("devtools/shared/protocol"); -const { dampTestSpec } = require("./spec"); +const { dampTestSpec } = require("damp-test/tests/server/spec"); exports.DampTestActor = protocol.ActorClassWithSpec(dampTestSpec, { initialize(conn) { diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js b/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js index 74bbe5564626..bcb257ceca2f 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js @@ -11,11 +11,11 @@ const { testTeardown, runTest, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); const protocol = require("devtools/shared/protocol"); const { FrontClassWithSpec } = protocol; -const { dampTestSpec } = require("./spec"); +const { dampTestSpec } = require("damp-test/tests/server/spec"); // Test parameters const ATTRIBUTES = 10; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/complicated.js b/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/complicated.js index b2d90791a8cf..3bc77a67ffcd 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/complicated.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/complicated.js @@ -11,7 +11,7 @@ const { testSetup, testTeardown, COMPLICATED_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(COMPLICATED_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/simple.js b/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/simple.js index ed30bd87e066..aaf7f91caa25 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/simple.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/styleeditor/simple.js @@ -11,7 +11,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/toolbox/panels-in-background.js b/testing/talos/talos/tests/devtools/addon/content/tests/toolbox/panels-in-background.js index 1bc252031ef2..854b1ff2fbf6 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/toolbox/panels-in-background.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/toolbox/panels-in-background.js @@ -12,7 +12,7 @@ const { testSetup, testTeardown, PAGES_BASE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(PAGES_BASE_URL + "custom/panels-in-background/index.html"); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/autocomplete.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/autocomplete.js index deac198ae597..c063fb14b897 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/autocomplete.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/autocomplete.js @@ -11,7 +11,7 @@ const { testSetup, testTeardown, waitForTick, -} = require("../head"); +} = require("damp-test/tests/head"); const TEST_NAME = "console.autocomplete"; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/bulklog.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/bulklog.js index 2d4f418eef03..94c5dad6d5c5 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/bulklog.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/bulklog.js @@ -12,8 +12,10 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); -const { waitForConsoleOutputChildListChange } = require("./webconsole-helpers"); +} = require("damp-test/tests/head"); +const { + waitForConsoleOutputChildListChange, +} = require("damp-test/tests/webconsole/webconsole-helpers"); module.exports = async function() { let TOTAL_MESSAGES = 1000; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/cold-open.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/cold-open.js index a6c608c44598..dd7bf5aaaf1a 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/cold-open.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/cold-open.js @@ -10,7 +10,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/complicated.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/complicated.js index 20f1097cbc23..06bcfd4d1157 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/complicated.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/complicated.js @@ -11,8 +11,10 @@ const { testSetup, testTeardown, COMPLICATED_URL, -} = require("../head"); -const { reloadConsoleAndLog } = require("./webconsole-helpers"); +} = require("damp-test/tests/head"); +const { + reloadConsoleAndLog, +} = require("damp-test/tests/webconsole/webconsole-helpers"); const { AppConstants } = require("resource://gre/modules/AppConstants.jsm"); const EXPECTED_MESSAGES = [ diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/custom.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/custom.js index 0dc3e23fdf05..197d2ce7bb1e 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/custom.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/custom.js @@ -10,8 +10,10 @@ const { testSetup, testTeardown, PAGES_BASE_URL, -} = require("../head"); -const { reloadConsoleAndLog } = require("./webconsole-helpers"); +} = require("damp-test/tests/head"); +const { + reloadConsoleAndLog, +} = require("damp-test/tests/webconsole/webconsole-helpers"); const TEST_URL = PAGES_BASE_URL + "custom/console/index.html"; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js index e38a0ea7e6ba..406c7f2f8beb 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js @@ -12,7 +12,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); module.exports = async function() { let tab = await testSetup(SIMPLE_URL); diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/openwithcache.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/openwithcache.js index 05eb9b041249..9ba2b5f7bfe7 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/openwithcache.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/openwithcache.js @@ -10,7 +10,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); const TOTAL_MESSAGES = 100; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/simple.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/simple.js index 1a521a353301..910b15067eb6 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/simple.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/simple.js @@ -10,8 +10,10 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); -const { reloadConsoleAndLog } = require("./webconsole-helpers"); +} = require("damp-test/tests/head"); +const { + reloadConsoleAndLog, +} = require("damp-test/tests/webconsole/webconsole-helpers"); const EXPECTED_MESSAGES = 1; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/streamlog.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/streamlog.js index 97551f9eaaee..d8d1387123b6 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/streamlog.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/streamlog.js @@ -11,7 +11,7 @@ const { testSetup, testTeardown, SIMPLE_URL, -} = require("../head"); +} = require("damp-test/tests/head"); // Log a stream of console messages, 1 per rAF. Then record the average // time per rAF. The idea is that the console being slow can slow down diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/typing.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/typing.js index edc218f29858..628fb3be3968 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/typing.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/typing.js @@ -11,7 +11,7 @@ const { testSetup, testTeardown, waitForTick, -} = require("../head"); +} = require("damp-test/tests/head"); const TEST_NAME = "console.typing"; const LOGS_NUMBER = 500; diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/webconsole-helpers.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/webconsole-helpers.js index 246d348f28e5..5f608904cb88 100644 --- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/webconsole-helpers.js +++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/webconsole-helpers.js @@ -4,7 +4,7 @@ "use strict"; -const { reloadPageAndLog } = require("../head"); +const { reloadPageAndLog } = require("damp-test/tests/head"); /** * @param {String} label: The name of the test.