diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-03-23 01:49:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 01:49:36 +0300 |
| commit | 93f5717c03170975b3bd3925dbc16f77dc9b3327 (patch) | |
| tree | 01b869aa3ed235f1488a07282ba4d23f45b78812 /tests/PHPUnit/Framework | |
| parent | 0eb8c7c08676e50c955fd2e1081b490a62026a59 (diff) | |
Remove user alias from DB (#15714)
* Remove alias
* fix more tests
* fix more system tests
* fix ui tests
* add to developer changelog
* fix typo
Diffstat (limited to 'tests/PHPUnit/Framework')
| -rw-r--r-- | tests/PHPUnit/Framework/Fixture.php | 4 | ||||
| -rw-r--r-- | tests/PHPUnit/Framework/XssTesting.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 5fb6dae988..8d2e37da54 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -737,9 +737,9 @@ class Fixture extends \PHPUnit\Framework\Assert } if (empty($user) || $removeExisting) { - $model->addUser($login, $password, 'hello@example.org', $login, Date::now()->getDatetime()); + $model->addUser($login, $password, 'hello@example.org', Date::now()->getDatetime()); } else { - $model->updateUser($login, $password, 'hello@example.org', $login); + $model->updateUser($login, $password, 'hello@example.org'); } try { if (!$model->getUserByTokenAuth(self::ADMIN_USER_TOKEN)) { diff --git a/tests/PHPUnit/Framework/XssTesting.php b/tests/PHPUnit/Framework/XssTesting.php index ba2853a40e..2f0ea5c5fe 100644 --- a/tests/PHPUnit/Framework/XssTesting.php +++ b/tests/PHPUnit/Framework/XssTesting.php @@ -138,8 +138,6 @@ JS; 'angular-(useragent)', 'twig-(annotation)', 'angular-(Annotation note 3)', - 'twig-(useralias)', - 'angular-(useralias)', 'twig-(scheduledreport)', 'twig-(dimensionname)', 'twig-(category)', |