Fix Installer UI tests (#16781)

* Fix Installer UI tests

* login after update no longer required

* updates expected screenshots

5 files changed, 9 insertions, 28 deletions

diff --git a/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png b/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png
index cd132f5882..885d405562 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_latest_version_available.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f32cc042e377cfd2cb1ef7e95d53b69c7510964df5b51402f0b995a7910f538c
-size 3014
+oid sha256:21136ad8a3b203b40bdac6bf7e1b115c5a6f98e6d58b72096b7d32109942633e
+size 3028
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png b/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png
index 5230bb2239..ab97f4cb05 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64f3a6bc85efcc25508c940104c1baadde843d75450afdd309da7f4c75cbd4ef
-size 99695
+oid sha256:8f8a9c4dacd5bb4820fc74f2b58508a22b57327d0b4ef237e7331574a474002a
+size 98263
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
index efb14ae531..50c3f5a64e 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75d614e2093741c9d9f7faae260a0a1c96b52c05ebeaf8b0dfdf9b3777453dfa
-size 62610
+oid sha256:46c38fd2b947f1c0f6e312a9228f57b065a69fee2b9055ceae607408993fa26b
+size 43674
diff --git a/tests/UI/specs/OneClickUpdate_spec.js b/tests/UI/specs/OneClickUpdate_spec.js
index d1c9faec18..1e1f776876 100644
--- a/tests/UI/specs/OneClickUpdate_spec.js
+++ b/tests/UI/specs/OneClickUpdate_spec.js
@@ -75,12 +75,6 @@ describe("OneClickUpdate", function () {
             }
         }
 
-        await page.waitFor('#login_form_login', { visible: true });
-
-        await page.type('#login_form_login', 'superUserLogin');
-        await page.type('#login_form_password', 'superUserPass');
-        await page.click('#login_form_submit');
-
         await page.waitFor('.site-without-data', { visible: true });
         await page.waitForNetworkIdle();
 
diff --git a/tests/resources/install-matomo.php b/tests/resources/install-matomo.php
index 7fa2587a52..7a4daa759c 100644
--- a/tests/resources/install-matomo.php
+++ b/tests/resources/install-matomo.php
@@ -13,6 +13,7 @@ use Piwik\Auth\Password;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
+use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\UsersManager;
 use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
 use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
@@ -91,12 +92,7 @@ function createSuperUser() {
     $user  = $model->getUser($login);
 
     if (empty($user)) {
-        // @todo remove once there is a first stable 4.0 release
-        if (version_compare(\Piwik\Version::VERSION, '4.0.0-b1', '<')) {
-            $model->addUser($login, $password, 'hello@example.org', $login, '01234567890123456789012345678912', Date::now()->getDatetime());
-        } else {
-            $model->addUser($login, $password, 'hello@example.org', Date::now()->getDatetime());
-        }
+        $model->addUser($login, $password, 'hello@example.org', Date::now()->getDatetime());
     } else {
         $model->updateUser($login, $password, 'hello@example.org');
     }
@@ -141,14 +137,6 @@ function createWebsite($dateTime)
     return $idSite;
 }
 
-function getTokenAuth()
-{
-    $model = new \Piwik\Plugins\UsersManager\Model();
-    $user  = $model->getUser('superUserLogin');
-
-    return $user['token_auth'];
-}
-
 $_SERVER['HTTP_HOST'] = $host;
 $_SERVER['SERVER_NAME'] = $host;
 $dbConfig['dbname'] = 'latest_stable';
@@ -229,5 +217,4 @@ $settings->releaseChannel->save();
 print "set release channel\n";
 
 // print token auth (on last line so it can be easily parsed)
-$tokenAuth = getTokenAuth();
-print "$tokenAuth";
\ No newline at end of file
+print Piwik::requestTemporarySystemAuthToken('InstallerUITests', 24);
\ No newline at end of file