diff --git a/core/tests/Drupal/Nightwatch/Commands/installDrupal.js b/core/tests/Drupal/Nightwatch/Commands/drupalInstall.js similarity index 96% rename from core/tests/Drupal/Nightwatch/Commands/installDrupal.js rename to core/tests/Drupal/Nightwatch/Commands/drupalInstall.js index 694ba8b08018f5304c26c117fae9201827935b2b..2f35adfab5552bbd67a96c0b55f86a7db0e20c8e 100644 --- a/core/tests/Drupal/Nightwatch/Commands/installDrupal.js +++ b/core/tests/Drupal/Nightwatch/Commands/drupalInstall.js @@ -14,7 +14,7 @@ import { commandAsWebserver } from '../globals'; * @return {object} * The 'browser' object. */ -exports.command = function installDrupal({ setupFile = '' }, callback) { +exports.command = function drupalInstall({ setupFile = '' }, callback) { const self = this; try { diff --git a/core/tests/Drupal/Nightwatch/Commands/logAndEnd.js b/core/tests/Drupal/Nightwatch/Commands/drupalLogAndEnd.js similarity index 90% rename from core/tests/Drupal/Nightwatch/Commands/logAndEnd.js rename to core/tests/Drupal/Nightwatch/Commands/drupalLogAndEnd.js index 166a48bd7a1b561387eb90db352541d9f78f7542..c3b5d3d649431b9ea8bfced1eb5906780f83e8b6 100644 --- a/core/tests/Drupal/Nightwatch/Commands/logAndEnd.js +++ b/core/tests/Drupal/Nightwatch/Commands/drupalLogAndEnd.js @@ -11,7 +11,7 @@ * @return {object} * The 'browser' object. */ -exports.command = function logAndEnd({ onlyOnError = true }, callback) { +exports.command = function drupalLogAndEnd({ onlyOnError = true }, callback) { const self = this; this.drupalLogConsole = true; this.drupalLogConsoleOnlyOnError = onlyOnError; diff --git a/core/tests/Drupal/Nightwatch/Commands/relativeURL.js b/core/tests/Drupal/Nightwatch/Commands/drupalRelativeURL.js similarity index 88% rename from core/tests/Drupal/Nightwatch/Commands/relativeURL.js rename to core/tests/Drupal/Nightwatch/Commands/drupalRelativeURL.js index c0f9bba4642a069ac372f7cc6ddcb4bc349cc7b5..cff41e14b9887c854caa8d30ff85e05a48ff28c0 100644 --- a/core/tests/Drupal/Nightwatch/Commands/relativeURL.js +++ b/core/tests/Drupal/Nightwatch/Commands/drupalRelativeURL.js @@ -10,7 +10,7 @@ * @return {object} * The 'browser' object. */ -exports.command = function relativeURL(pathname, callback) { +exports.command = function drupalRelativeURL(pathname, callback) { const self = this; this.url(`${process.env.DRUPAL_TEST_BASE_URL}${pathname}`); diff --git a/core/tests/Drupal/Nightwatch/Commands/uninstallDrupal.js b/core/tests/Drupal/Nightwatch/Commands/drupalUninstall.js similarity index 95% rename from core/tests/Drupal/Nightwatch/Commands/uninstallDrupal.js rename to core/tests/Drupal/Nightwatch/Commands/drupalUninstall.js index e85c4ac07068267da081ea0818cb719206dbfc29..ed5f999bc2cbe199715a18fcab8727883012fcf1 100644 --- a/core/tests/Drupal/Nightwatch/Commands/uninstallDrupal.js +++ b/core/tests/Drupal/Nightwatch/Commands/drupalUninstall.js @@ -9,7 +9,7 @@ import { commandAsWebserver } from '../globals'; * @return {object} * The 'browser' object. */ -exports.command = function uninstallDrupal(callback) { +exports.command = function drupalUninstal(callback) { const self = this; const prefix = self.drupalDbPrefix; diff --git a/core/tests/Drupal/Nightwatch/Tests/exampleTest.js b/core/tests/Drupal/Nightwatch/Tests/exampleTest.js index f150ec7b5358123c5a3265167f9565a2be83a80a..eeb1f4af96abdf753ef4dbd24d7392666ada1ac9 100644 --- a/core/tests/Drupal/Nightwatch/Tests/exampleTest.js +++ b/core/tests/Drupal/Nightwatch/Tests/exampleTest.js @@ -2,18 +2,18 @@ module.exports = { '@tags': ['core'], before(browser) { browser - .installDrupal({ setupFile: 'core/tests/Drupal/TestSite/TestSiteInstallTestScript.php' }); + .drupalInstall({ setupFile: 'core/tests/Drupal/TestSite/TestSiteInstallTestScript.php' }); }, after(browser) { browser - .uninstallDrupal(); + .drupalUninstall(); }, 'Test page': (browser) => { browser - .relativeURL('/test-page') + .drupalRelativeURL('/test-page') .waitForElementVisible('body', 1000) .assert.containsText('body', 'Test page text') - .logAndEnd({ onlyOnError: false }); + .drupalLogAndEnd({ onlyOnError: false }); }, /** 'Example failing test': (browser) => { @@ -25,7 +25,7 @@ module.exports = { // Wait for some errors to build up. .pause(5000) .assert.containsText('h1', 'I\'m the operator with my pocket calculator') - .logAndEnd(); + .drupalLogAndEnd(); }, **/ };