Skip to content

Commit

Permalink
adjust further configs and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
torhoehn committed Nov 28, 2024
1 parent 2377017 commit e220c27
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2016 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions dev/tests/api-functional/config/install-config-mysql.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -21,7 +21,7 @@ return [
'admin-firstname' => 'Admin',
'admin-email' => '[email protected]',
'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(),
Expand Down
6 changes: 3 additions & 3 deletions dev/tests/integration/etc/install-config-mysql.php.dist
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

return [
'db-host' => 'localhost',
'db-user' => 'root',
'db-password' => '123123q',
'db-password' => '1234512345q!',
'db-name' => 'magento_integration_tests',
'db-prefix' => '',
'backend-frontname' => 'backend',
Expand Down
12 changes: 6 additions & 6 deletions dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

namespace Magento\User\Model;
Expand Down Expand Up @@ -392,11 +392,11 @@ public function testBeforeSavePasswordHash()
)->setEmail(
'[email protected]'
)->setPassword(
'123123q'
'1234512345q!'
);
$this->_model->save();
$this->assertStringNotContainsString(
'123123q',
'1234512345q!',
$this->_model->getPassword(),
'Password is expected to be hashed'
);
Expand Down Expand Up @@ -486,9 +486,9 @@ public function testBeforeSaveValidationSuccess()
)->setEmail(
'[email protected]'
)->setPassword(
'1234abc'
'1234512345q!'
)->setPasswordConfirmation(
'1234abc'
'1234512345q!'
);
$this->_model->save();
}
Expand Down
6 changes: 3 additions & 3 deletions dev/tests/setup-integration/etc/install-config-mysql.php.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2017 Adobe
* All Rights Reserved.
*/

return [
Expand All @@ -14,7 +14,7 @@ return [
'db-prefix' => '',
'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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -175,7 +175,7 @@ protected function setUp(): void
public function testExecute()
{
$this->input['--' . AdminAccount::KEY_USER] = 'user';
$this->input['--' . AdminAccount::KEY_PASSWORD] = '123123q';
$this->input['--' . AdminAccount::KEY_PASSWORD] = '1234512345q!';
$this->input['--' . AdminAccount::KEY_EMAIL] = '[email protected]';
$this->input['--' . AdminAccount::KEY_FIRST_NAME] = 'John';
$this->input['--' . AdminAccount::KEY_LAST_NAME] = 'Doe';
Expand Down
6 changes: 3 additions & 3 deletions setup/src/Magento/Setup/Test/Unit/Model/AdminAccountTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -57,7 +57,7 @@ protected function setUp(): void
AdminAccount::KEY_FIRST_NAME => 'John',
AdminAccount::KEY_LAST_NAME => 'Doe',
AdminAccount::KEY_EMAIL => '[email protected]',
AdminAccount::KEY_PASSWORD => '123123q',
AdminAccount::KEY_PASSWORD => '1234512345q!',
AdminAccount::KEY_USER => 'admin',
AdminAccount::KEY_PREFIX => 'pre_'
];
Expand Down

0 comments on commit e220c27

Please sign in to comment.