From 0d1f357defa8e9fac1a66cd57d71e10c452dfc81 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Thu, 7 May 2015 11:24:01 -0500
Subject: [PATCH] MAGETWO-36920: Use dashes instead of underscores in option
names
- backend-frontname
---
app/code/Magento/Backend/Setup/ConfigOptionsList.php | 2 +-
dev/tests/api-functional/config/install-config-mysql.php.dist | 2 +-
dev/tests/integration/etc/install-config-mysql.php.dist | 2 +-
.../integration/etc/install-config-mysql.travis.php.dist | 2 +-
dev/tests/performance/config.php.dist | 2 +-
.../framework/Magento/TestFramework/Performance/Config.php | 4 ++--
.../framework/Magento/TestFramework/Performance/Scenario.php | 2 +-
.../unit/testsuite/Magento/Test/Performance/ConfigTest.php | 2 +-
.../Performance/_files/bootstrap/config_dist/config.php.dist | 2 +-
.../Performance/_files/bootstrap/config_normal/config.php | 2 +-
.../_files/bootstrap/config_normal/config.php.dist | 2 +-
.../testsuite/Magento/Test/Performance/_files/config_data.php | 2 +-
dev/tests/performance/testsuite/backend.jmx | 2 +-
dev/tests/performance/testsuite/checkout.jmx | 2 +-
dev/tests/performance/testsuite/product_edit.jmx | 2 +-
dev/tests/performance/testsuite/reusable/admin_login.jmx | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php
index 83a953cd2f2..4872cd18fe2 100644
--- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php
+++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php
@@ -19,7 +19,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
/**
* Input key for the options
*/
- const INPUT_KEY_BACKEND_FRONTNAME = 'backend_frontname';
+ const INPUT_KEY_BACKEND_FRONTNAME = 'backend-frontname';
/**
* Path to the values in the deployment config
diff --git a/dev/tests/api-functional/config/install-config-mysql.php.dist b/dev/tests/api-functional/config/install-config-mysql.php.dist
index 535cfb7232e..a6ed54006dd 100644
--- a/dev/tests/api-functional/config/install-config-mysql.php.dist
+++ b/dev/tests/api-functional/config/install-config-mysql.php.dist
@@ -13,7 +13,7 @@ return [
'db_name' => 'magento_functional_tests',
'db_user' => 'root',
'db_password' => '',
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'base_url' => 'http://localhost/',
'use_secure' => '0',
'use_rewrites' => '0',
diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index 0d8fb591eb1..1887855e3a1 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -10,7 +10,7 @@ return [
'db_password' => '',
'db_name' => 'magento_integration_tests',
'db_prefix' => '',
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
index a0e25fd8038..5e4a2a51384 100644
--- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
@@ -10,7 +10,7 @@ return [
'db_password' => '',
'db_name' => 'magento_integration_tests',
'db_prefix' => 'travis_',
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
diff --git a/dev/tests/performance/config.php.dist b/dev/tests/performance/config.php.dist
index e145b9768ff..5e70a3617ac 100644
--- a/dev/tests/performance/config.php.dist
+++ b/dev/tests/performance/config.php.dist
@@ -26,7 +26,7 @@ return array(
'admin_user' => 'admin',
'admin_password' => '123123q',
'admin_use_security_key' => '0',
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
),
'options_no_value' => array(
'cleanup_database',
diff --git a/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php b/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php
index bd01b881c6b..75eab279b58 100644
--- a/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php
+++ b/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php
@@ -117,7 +117,7 @@ class Config
}
// Validate admin options data
- $requiredAdminKeys = ['admin_user', 'admin_password', 'backend_frontname'];
+ $requiredAdminKeys = ['admin_user', 'admin_password', 'backend-frontname'];
foreach ($requiredAdminKeys as $requiredKeyName) {
if (empty($configData['application']['installation']['options'][$requiredKeyName])) {
throw new \Magento\Framework\Exception\LocalizedException(
@@ -277,7 +277,7 @@ class Config
\Magento\TestFramework\Performance\Scenario::ARG_HOST => $this->getApplicationUrlHost(),
\Magento\TestFramework\Performance\Scenario::ARG_PATH => $this->getApplicationUrlPath(),
\Magento\TestFramework\Performance\Scenario::ARG_BASEDIR => $this->getApplicationBaseDir(),
- \Magento\TestFramework\Performance\Scenario::ARG_BACKEND_FRONTNAME => $options['backend_frontname'],
+ \Magento\TestFramework\Performance\Scenario::ARG_BACKEND_FRONTNAME => $options['backend-frontname'],
\Magento\TestFramework\Performance\Scenario::ARG_ADMIN_USER => $options['admin_user'],
\Magento\TestFramework\Performance\Scenario::ARG_ADMIN_PASSWORD => $options['admin_password'],
'jmeter.save.saveservice.output_format' => 'xml',
diff --git a/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php b/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php
index ab19c64f5ae..bcb56c85e19 100644
--- a/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php
+++ b/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php
@@ -28,7 +28,7 @@ class Scenario
const ARG_ADMIN_PASSWORD = 'admin_password';
- const ARG_BACKEND_FRONTNAME = 'backend_frontname';
+ const ARG_BACKEND_FRONTNAME = 'backend-frontname';
/**#@-*/
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php
index 39685b58894..7a2dba1f220 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php
@@ -144,7 +144,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$expectedOptions = [
'option1' => 'value 1',
'option2' => 'value 2',
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => 'admin',
'admin_password' => 'password1',
];
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist
index 6db1c505bff..7f63b4ad90f 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist
@@ -10,7 +10,7 @@ return array(
'url_path' => '/',
'installation' => array(
'options' => array(
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => 'admin',
'admin_password' => 'password1',
),
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php
index 463b896d34d..a85b38987cd 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php
@@ -10,7 +10,7 @@ return [
'url_path' => '/',
'installation' => [
'options' => [
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => 'admin',
'admin_password' => 'password1',
],
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist
index 577aadcc45b..21325212b5a 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist
@@ -10,7 +10,7 @@ return array(
'url_path' => '/',
'installation' => array(
'options' => array(
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => 'admin',
'admin_password' => 'password1',
),
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php
index eaa852c5e31..629f6737ca1 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php
@@ -12,7 +12,7 @@ return [
'options' => [
'option1' => 'value 1',
'option2' => 'value 2',
- 'backend_frontname' => 'backend',
+ 'backend-frontname' => 'backend',
'admin_user' => 'admin',
'admin_password' => 'password1',
],
diff --git a/dev/tests/performance/testsuite/backend.jmx b/dev/tests/performance/testsuite/backend.jmx
index 7108005cdfa..28ca78a63bc 100644
--- a/dev/tests/performance/testsuite/backend.jmx
+++ b/dev/tests/performance/testsuite/backend.jmx
@@ -20,7 +20,7 @@
</elementProp>
<elementProp name="ADMIN_PATH" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PATH</stringProp>
- <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp>
+ <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
diff --git a/dev/tests/performance/testsuite/checkout.jmx b/dev/tests/performance/testsuite/checkout.jmx
index aa9c58a401a..38e52803f7d 100644
--- a/dev/tests/performance/testsuite/checkout.jmx
+++ b/dev/tests/performance/testsuite/checkout.jmx
@@ -40,7 +40,7 @@
</elementProp>
<elementProp name="ADMIN_PATH" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PATH</stringProp>
- <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp>
+ <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
diff --git a/dev/tests/performance/testsuite/product_edit.jmx b/dev/tests/performance/testsuite/product_edit.jmx
index 384381cac01..8e2f81f8ae1 100644
--- a/dev/tests/performance/testsuite/product_edit.jmx
+++ b/dev/tests/performance/testsuite/product_edit.jmx
@@ -20,7 +20,7 @@
</elementProp>
<elementProp name="ADMIN_PATH" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PATH</stringProp>
- <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp>
+ <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="USERS" elementType="Argument">
diff --git a/dev/tests/performance/testsuite/reusable/admin_login.jmx b/dev/tests/performance/testsuite/reusable/admin_login.jmx
index 57f291edb6a..8964b81dcb3 100644
--- a/dev/tests/performance/testsuite/reusable/admin_login.jmx
+++ b/dev/tests/performance/testsuite/reusable/admin_login.jmx
@@ -155,7 +155,7 @@
</elementProp>
<elementProp name="ADMIN_PATH" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PATH</stringProp>
- <stringProp name="Argument.value">${__P(path,/)}${__P(backend_frontname,backend)}/</stringProp>
+ <stringProp name="Argument.value">${__P(path,/)}${__P(backend-frontname,backend)}/</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
--
GitLab