diff --git a/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordActionGroup.xml b/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordActionGroup.xml
index 6f6cb89d1bc64..d7bba5e4bb8a3 100644
--- a/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordActionGroup.xml
+++ b/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordActionGroup.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordUsingOldPasswordActionGroup.xml b/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordUsingOldPasswordActionGroup.xml
index eb89154aaa39a..a7e2d17b8010b 100644
--- a/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordUsingOldPasswordActionGroup.xml
+++ b/app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordUsingOldPasswordActionGroup.xml
@@ -1,8 +1,8 @@
@@ -12,8 +12,8 @@
Reset password using old password on All Users page.
-
-
+
+
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminOldPasswordRequiredToResetAdminPasswordTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminOldPasswordRequiredToResetAdminPasswordTest.xml
index 821844a31c6ef..015c96abe2c02 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminOldPasswordRequiredToResetAdminPasswordTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminOldPasswordRequiredToResetAdminPasswordTest.xml
@@ -1,8 +1,8 @@
@@ -40,7 +40,7 @@
-
+
diff --git a/app/code/Magento/User/Model/UserValidationRules.php b/app/code/Magento/User/Model/UserValidationRules.php
index 2c39f66da990c..22774a363dad4 100644
--- a/app/code/Magento/User/Model/UserValidationRules.php
+++ b/app/code/Magento/User/Model/UserValidationRules.php
@@ -1,7 +1,7 @@
@@ -21,8 +21,8 @@
John
Doe
admin@example.com
- 123123q
- 123123q
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
true
@@ -34,8 +34,8 @@
- 123123qA
- 123123qA
+ 123123qA1234
+ 123123qA1234
{{roleSales.rolename}}
@@ -44,8 +44,8 @@
John
Doe
admin@example.com
- 123123QA
- 123123QA
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
true
@@ -61,8 +61,8 @@
John
Doe
admin@example.com
- 123123q
- 123123q
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
true
@@ -78,8 +78,8 @@
John
Doe
admin@example.com
- 123123QA
- 123123QA
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
true
@@ -98,15 +98,15 @@
admin
John
Smith
- admin123
+ admin@123456
admin3
admin3
admin3
admin3WebUser@example.com
- 123123q
- 123123q
+ 1234512345q!
+ 1234512345q!
en_US
true
123123q
@@ -129,8 +129,8 @@
John
Doe
admin@example.com
- 123123q
- 123123q
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
true
@@ -150,8 +150,8 @@
FirstName
LastName
admin@example.com
- 123123q
- 123123q
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
{{_ENV.MAGENTO_ADMIN_PASSWORD}}
@@ -166,8 +166,8 @@
FirstName
LastName
admin@example.com
- 123123q
- 123123q
+ 1234512345q!
+ 1234512345q!
en_US
English (United States)
{{_ENV.MAGENTO_ADMIN_PASSWORD}}
@@ -188,8 +188,8 @@
John
Doe
admin@example.com
- 123123QA
- 123123QA
+ 1234512345q!
+ 1234512345q!
{{_ENV.MAGENTO_ADMIN_PASSWORD}}
Administrators
@@ -201,8 +201,8 @@
John
Doe
admin@example.com
- 123123UPD
- 123123UPD
+ 1234512345q!
+ 1234512345q!
{{_ENV.MAGENTO_ADMIN_PASSWORD}}
- 1
diff --git a/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php b/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
index bdec0bd482956..1f72f61325961 100644
--- a/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
+++ b/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
@@ -201,19 +201,19 @@ public static function executeDataProvider()
{
return [
[
- 'currentUserPassword' => '123123q',
+ 'currentUserPassword' => '1234512345q!',
'userId' => 1,
'currentUserId' => 2,
'resultMethod' => 'addSuccess',
],
[
- 'currentUserPassword' => '123123q',
+ 'currentUserPassword' => '1234512345q!',
'userId' => 0,
'currentUserId' => 2,
'resultMethod' => 'addError',
],
[
- 'currentUserPassword' => '123123q',
+ 'currentUserPassword' => '1234512345q!',
'userId' => 1,
'currentUserId' => 1,
'resultMethod' => 'addError',
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 abff693cb15ad..2d72df1f7dc14 100644
--- a/dev/tests/api-functional/config/install-config-mysql.php.dist
+++ b/dev/tests/api-functional/config/install-config-mysql.php.dist
@@ -2,8 +2,8 @@
/**
* Magento console installer options for Web API functional tests. Are used in functional tests bootstrap.
*
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
*/
return [
'language' => 'en_US',
@@ -21,7 +21,7 @@ return [
'admin-firstname' => 'Admin',
'admin-email' => 'admin@example.com',
'admin-user' => 'admin',
- 'admin-password' => '123123q',
+ 'admin-password' => '1234512345q!',
'admin-use-security-key' => '0',
/* PayPal has limitation for order number - 20 characters. 10 digits prefix + 8 digits number is good enough */
'sales-order-increment-prefix' => time(),
diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index 1f6399bc6b4dc..06af87b2e1769 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -1,13 +1,13 @@
'localhost',
'db-user' => 'root',
- 'db-password' => '123123q',
+ 'db-password' => '1234512345q!',
'db-name' => 'magento_integration_tests',
'db-prefix' => '',
'backend-frontname' => 'backend',
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap.php
index 92a108324d510..acd633ca61523 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap.php
@@ -1,7 +1,7 @@
setEmail(
'jdoe@example.com'
)->setPassword(
- '123123q'
+ '1234512345q!'
);
$this->_model->save();
$this->assertStringNotContainsString(
- '123123q',
+ '1234512345q!',
$this->_model->getPassword(),
'Password is expected to be hashed'
);
@@ -488,9 +488,9 @@ public function testBeforeSaveValidationSuccess()
)->setEmail(
'jdoe@example.com'
)->setPassword(
- '1234abc'
+ '1234512345q!'
)->setPasswordConfirmation(
- '1234abc'
+ '1234512345q!'
);
$this->_model->save();
}
diff --git a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
index 3b3657568af3c..f968cbe2db9c0 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
@@ -413,7 +413,7 @@ define([
expect($.validator.methods['validate-admin-password']
.call($.validator.prototype, ' ')).toEqual(true);
expect($.validator.methods['validate-admin-password']
- .call($.validator.prototype, '123@123.com')).toEqual(true);
+ .call($.validator.prototype, '1234@123.com')).toEqual(true);
expect($.validator.methods['validate-admin-password']
.call($.validator.prototype, 'abc')).toEqual(false);
expect($.validator.methods['validate-admin-password']
diff --git a/dev/tests/setup-integration/etc/install-config-mysql.php.dist b/dev/tests/setup-integration/etc/install-config-mysql.php.dist
index 5dea43f9fa583..0f854cfe2c9e4 100644
--- a/dev/tests/setup-integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/setup-integration/etc/install-config-mysql.php.dist
@@ -1,7 +1,7 @@
'',
'backend-frontname' => 'admin',
'admin-user' => 'admin',
- 'admin-password' => '123123q',
+ 'admin-password' => '1234512345q!',
'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 72baf69740c9b..d410134f581c4 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1,6 +1,6 @@
/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
*/
define([
@@ -685,13 +685,13 @@ define([
return false;
}
- if (pass.length < 7) {
+ if (pass.length < 12) {
return false;
}
return true;
},
- $.mage.__('Please enter 7 or more characters, using both numeric and alphabetic.')
+ $.mage.__('Please enter 12 or more characters, using both numeric and alphabetic.')
],
'validate-customer-password': [
function (v, elm) {
diff --git a/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php b/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php
index 836a2aab18b18..4065c91b94f14 100644
--- a/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php
@@ -1,7 +1,7 @@
setFirstName('Firstname')
->setLastName('Lastname')
->setUserName('admin' . $i)
- ->setPassword('123123q')
+ ->setPassword('1234512345q!')
->setIsActive(1);
$adminUser->save();
}
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getActionTitle()
{
@@ -113,7 +113,7 @@ public function getActionTitle()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function introduceParamLabels()
{
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
index d7da1c2de2cbe..b0cf7c6584a93 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/AdminUserCreateCommandTest.php
@@ -1,7 +1,7 @@
'user',
- '--' . AdminAccount::KEY_PASSWORD => '123123q',
+ '--' . AdminAccount::KEY_PASSWORD => '1234512345q!',
'--' . AdminAccount::KEY_EMAIL => 'test@test.com',
'--' . AdminAccount::KEY_FIRST_NAME => 'John',
'--' . AdminAccount::KEY_LAST_NAME => 'Doe'
];
$data = [
AdminAccount::KEY_USER => 'user',
- AdminAccount::KEY_PASSWORD => '123123q',
+ AdminAccount::KEY_PASSWORD => '1234512345q!',
AdminAccount::KEY_EMAIL => 'test@test.com',
AdminAccount::KEY_FIRST_NAME => 'John',
AdminAccount::KEY_LAST_NAME => 'Doe',
@@ -93,7 +93,7 @@ public function testInteraction(): void
$this->questionHelperMock
->method('ask')
- ->willReturnOnConsecutiveCalls('admin', 'Password123', 'john.doe@example.com', 'John', 'Doe');
+ ->willReturnOnConsecutiveCalls('admin', 'Password1234', 'john.doe@example.com', 'John', 'Doe');
// We override the standard helper with our mock
$this->command->getHelperSet()->set($this->questionHelperMock, 'question');
@@ -102,7 +102,7 @@ public function testInteraction(): void
$expectedData = [
'admin-user' => 'admin',
- 'admin-password' => 'Password123',
+ 'admin-password' => 'Password1234',
'admin-email' => 'john.doe@example.com',
'admin-firstname' => 'John',
'admin-lastname' => 'Doe',
@@ -189,38 +189,38 @@ public static function validateDataProvider(): array
{
return [
[
- [null, 'Doe', 'admin', 'test@test.com', '123123q', '123123q'],
+ [null, 'Doe', 'admin', 'test@test.com', '1234512345q!', '1234512345q!'],
['"First Name" is required. Enter and try again.']
],
[
- ['John', null, null, 'test@test.com', '123123q', '123123q'],
+ ['John', null, null, 'test@test.com', '1234512345q!', '1234512345q!'],
['"User Name" is required. Enter and try again.', '"Last Name" is required. Enter and try again.'],
],
- [['John', 'Doe', 'admin', null, '123123q', '123123q'], ['Please enter a valid email.']],
+ [['John', 'Doe', 'admin', null, '1234512345q!', '1234512345q!'], ['Please enter a valid email.']],
[
- ['John', 'Doe', 'admin', 'test', '123123q', '123123q'],
+ ['John', 'Doe', 'admin', 'test', '1234512345q!', '1234512345q!'],
["'test' is not a valid email address in the basic format local-part@hostname"]
],
[
['John', 'Doe', 'admin', 'test@test.com', '', ''],
[
'Password is required field.',
- 'Your password must be at least 7 characters.',
+ 'Your password must be at least 12 characters.',
'Your password must include both numeric and alphabetic characters.'
]
],
[
['John', 'Doe', 'admin', 'test@test.com', '123123', '123123'],
[
- 'Your password must be at least 7 characters.',
+ 'Your password must be at least 12 characters.',
'Your password must include both numeric and alphabetic characters.'
]
],
[
- ['John', 'Doe', 'admin', 'test@test.com', '1231231', '1231231'],
+ ['John', 'Doe', 'admin', 'test@test.com', '123123123123', '123123123123'],
['Your password must include both numeric and alphabetic characters.']
],
- [['John', 'Doe', 'admin', 'test@test.com', '123123q', '123123q'], []],
+ [['John', 'Doe', 'admin', 'test@test.com', '1234512345q!', '1234512345q!'], []],
];
}
}
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
index 04f11505331b7..8cd36aa12bd01 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php
@@ -1,7 +1,7 @@
input['--' . AdminAccount::KEY_USER] = 'user';
- $this->input['--' . AdminAccount::KEY_PASSWORD] = '123123q';
+ $this->input['--' . AdminAccount::KEY_PASSWORD] = '1234512345q!';
$this->input['--' . AdminAccount::KEY_EMAIL] = 'test@test.com';
$this->input['--' . AdminAccount::KEY_FIRST_NAME] = 'John';
$this->input['--' . AdminAccount::KEY_LAST_NAME] = 'Doe';
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php b/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
index e11c58846cc67..dc1db5fad3a32 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
@@ -1,7 +1,7 @@
'John',
AdminAccount::KEY_LAST_NAME => 'Doe',
AdminAccount::KEY_EMAIL => 'john.doe@test.com',
- AdminAccount::KEY_PASSWORD => '123123q',
+ AdminAccount::KEY_PASSWORD => '1234512345q!',
AdminAccount::KEY_USER => 'admin',
AdminAccount::KEY_PREFIX => 'pre_'
];