[TASK] Unify installation tests 84/55784/2
authorAnja Leichsenring <anja.leichsenring@typo3.com>
Sat, 17 Feb 2018 10:24:52 +0000 (11:24 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 17 Feb 2018 20:35:13 +0000 (21:35 +0100)
MySql receives a test to install the introduction package, PgSql gets
one for the blank page preset.
With this change, both install suites check both kind of setup the
instance.

Change-Id: Ic21091f5bc3a0aa14a49e9e9fa65a5f9db829cdb
Resolves: #83949
Releases: master, 8.7
Reviewed-on: https://review.typo3.org/55784
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
composer.lock
typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlBlankPageCest.php [new file with mode: 0644]
typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlCest.php [deleted file]
typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlIntroductionPackageCest.php [new file with mode: 0644]
typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlBlankPageCest.php [new file with mode: 0644]
typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlCest.php [deleted file]
typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlIntroductionPackageCest.php [new file with mode: 0644]

index a9511a3..07fcc13 100644 (file)
         },
         {
             "name": "typo3/testing-framework",
-            "version": "1.2.3",
+            "version": "1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/testing-framework.git",
-                "reference": "85e274954b597c9bd94a936ab04b7a40d46a0410"
+                "reference": "e1e456ae30137cb7b74134a5f9b7c58ad2244fd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/85e274954b597c9bd94a936ab04b7a40d46a0410",
-                "reference": "85e274954b597c9bd94a936ab04b7a40d46a0410",
+                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/e1e456ae30137cb7b74134a5f9b7c58ad2244fd9",
+                "reference": "e1e456ae30137cb7b74134a5f9b7c58ad2244fd9",
                 "shasum": ""
             },
             "require": {
                 "tests",
                 "typo3"
             ],
-            "time": "2018-02-13T21:54:36+00:00"
+            "time": "2018-02-17T20:16:27+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlBlankPageCest.php b/typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlBlankPageCest.php
new file mode 100644 (file)
index 0000000..9dfb0a5
--- /dev/null
@@ -0,0 +1,72 @@
+<?php
+namespace TYPO3\CMS\Core\Tests\AcceptanceInstallMysql;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Click through installer, go to backend, check blank site in FE works
+ */
+class InstallWithMysqlBlankPageCest
+{
+    /**
+     * @param \AcceptanceTester $I
+     */
+    public function installTypo3OnMysql(\AcceptanceTester $I)
+    {
+        // Calling frontend redirects to installer
+        $I->amOnPage('/');
+
+        // EnvironmentAndFolders step
+        $I->waitForText('Installing TYPO3');
+        $I->see('System looks good. Continue!');
+        $I->click('System looks good. Continue!');
+
+        // DatabaseConnection step
+        $I->waitForText('Database connection');
+        $I->fillField('#t3-install-step-mysqliManualConfiguration-username', getenv('typo3DatabaseUsername'));
+        $I->fillField('#t3-install-step-mysqliManualConfiguration-password', getenv('typo3DatabasePassword'));
+        $I->click('Continue');
+
+        // DatabaseSelect step
+        $I->waitForText('Select database');
+        $I->click('#t3-install-form-db-select-type-new');
+        $I->fillField('#t3-install-step-database-new', getenv('typo3DatabaseName') . '_atimysql');
+        $I->click('Continue');
+
+        // DatabaseData step
+        $I->waitForText('Create user and import base data');
+        $I->fillField('#username', 'admin');
+        $I->fillField('#password', 'password');
+        $I->click('Continue');
+
+        // DefaultConfiguration step - Create empty page
+        $I->waitForText('Installation done!');
+        $I->click('#create-site');
+        $I->click('Open the TYPO3 Backend');
+
+        // Verify backend login successful
+        $I->waitForElement('#t3-username');
+        $I->fillField('#t3-username', 'admin');
+        $I->fillField('#t3-password', 'password');
+        $I->click('#t3-login-submit-section > button');
+        $I->waitForElement('.nav', 30);
+        $I->waitForElement('.scaffold-content iframe', 30);
+        $I->seeCookie('be_lastLoginProvider');
+        $I->seeCookie('be_typo_user');
+
+        // Verify default frontend is rendered
+        $I->amOnPage('/');
+        $I->waitForText('Welcome to a default website made with TYPO3');
+    }
+}
diff --git a/typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlCest.php b/typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlCest.php
deleted file mode 100644 (file)
index fc33fbd..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-namespace TYPO3\CMS\Core\Tests\AcceptanceInstallMysql;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Click through installer, go to backend, check blank site in FE works
- */
-class InstallWithMysqlCest
-{
-    /**
-     * @param \AcceptanceTester $I
-     */
-    public function installTypo3OnMysql(\AcceptanceTester $I)
-    {
-        // Calling frontend redirects to installer
-        $I->amOnPage('/');
-
-        // EnvironmentAndFolders step
-        $I->waitForText('Installing TYPO3');
-        $I->see('System looks good. Continue!');
-        $I->click('System looks good. Continue!');
-
-        // DatabaseConnection step
-        $I->waitForText('Database connection');
-        $I->fillField('#t3-install-step-mysqliManualConfiguration-username', getenv('typo3DatabaseUsername'));
-        $I->fillField('#t3-install-step-mysqliManualConfiguration-password', getenv('typo3DatabasePassword'));
-        $I->click('Continue');
-
-        // DatabaseSelect step
-        $I->waitForText('Select database');
-        $I->click('#t3-install-form-db-select-type-new');
-        $I->fillField('#t3-install-step-database-new', getenv('typo3DatabaseName') . '_atimysql');
-        $I->click('Continue');
-
-        // DatabaseData step
-        $I->waitForText('Create user and import base data');
-        $I->fillField('#username', 'admin');
-        $I->fillField('#password', 'password');
-        $I->click('Continue');
-
-        // DefaultConfiguration step - Create empty page
-        $I->waitForText('Installation done!');
-        $I->click('#create-site');
-        $I->click('Open the TYPO3 Backend');
-
-        // Verify backend login successful
-        $I->waitForElement('#t3-username');
-        $I->fillField('#t3-username', 'admin');
-        $I->fillField('#t3-password', 'password');
-        $I->click('#t3-login-submit-section > button');
-        $I->waitForElement('.nav', 30);
-        $I->waitForElement('.scaffold-content iframe', 30);
-        $I->seeCookie('be_lastLoginProvider');
-        $I->seeCookie('be_typo_user');
-
-        // Verify default frontend is rendered
-        $I->amOnPage('/');
-        $I->waitForText('Welcome to a default website made with TYPO3');
-    }
-}
diff --git a/typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlIntroductionPackageCest.php b/typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlIntroductionPackageCest.php
new file mode 100644 (file)
index 0000000..26953c5
--- /dev/null
@@ -0,0 +1,83 @@
+<?php
+namespace TYPO3\CMS\Core\Tests\AcceptanceInstallMysql;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Click through installer, go to backend, check blank site in FE works
+ */
+class InstallWithMysqlIntroductionPackageCest
+{
+    /**
+     * @param \AcceptanceTester $I
+     */
+    public function installTypo3OnMysql(\AcceptanceTester $I)
+    {
+        // Calling frontend redirects to installer
+        $I->amOnPage('/');
+
+        // EnvironmentAndFolders step
+        $I->waitForText('Installing TYPO3');
+        $I->waitForText('System looks good. Continue!');
+        $I->click('System looks good. Continue!');
+
+        // DatabaseConnection step
+        $I->waitForText('Database connection');
+        $I->fillField('#t3-install-step-mysqliManualConfiguration-username', getenv('typo3DatabaseUsername'));
+        $I->fillField('#t3-install-step-mysqliManualConfiguration-password', getenv('typo3DatabasePassword'));
+        $I->click('Continue');
+
+        // DatabaseSelect step
+        $I->waitForText('Select database');
+        $I->click('#t3-install-form-db-select-type-new');
+        $I->fillField('#t3-install-step-database-new', getenv('typo3DatabaseName') . '_atimysql');
+        $I->click('Continue');
+
+        // DatabaseData step
+        $I->waitForText('Create user and import base data');
+        $I->fillField('#username', 'admin');
+        $I->fillField('#password', 'password');
+        $I->click('Continue');
+
+        // DefaultConfiguration step - Create empty page
+        $I->waitForText('Installation done!');
+        $I->click('#load-distributions');
+        $I->click('Open the TYPO3 Backend');
+
+        // Verify backend login successful
+        $I->waitForElement('#t3-username');
+        $I->fillField('#t3-username', 'admin');
+        $I->fillField('#t3-password', 'password');
+        $I->click('#t3-login-submit-section > button');
+        $I->waitForElement('.nav', 30);
+        $I->waitForElement('.scaffold-content iframe', 30);
+        $I->seeCookie('be_lastLoginProvider');
+        $I->seeCookie('be_typo_user');
+
+        // Loading might take some time
+        $I->switchToIFrame('list_frame');
+        $I->waitForText('Get preconfigured distribution', 30);
+        $I->click('.t3-button-action-installdistribution');
+        $I->waitForText('You successfully installed the distribution:introduction', 30);
+
+        // Verify default frontend is rendered
+        $I->amOnPage('/');
+        $I->waitForText('Let us introduce you to TYPO3', 30);
+        $I->waitForText('Make it your own');
+
+        // Verify link
+        $I->click('[title="Features"]');
+        $I->waitForText('Feature Complete Out-of-the-box', 30);
+    }
+}
diff --git a/typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlBlankPageCest.php b/typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlBlankPageCest.php
new file mode 100644 (file)
index 0000000..1b04ecb
--- /dev/null
@@ -0,0 +1,68 @@
+<?php
+namespace TYPO3\CMS\Core\Tests\AcceptanceInstallPsql;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Click through installer, go to backend, check blank site in FE works
+ */
+class InstallWithPgsqlBlankPageCest
+{
+    /**
+     * @param \AcceptanceTester $I
+     */
+    public function installTypo3OnPgSql(\AcceptanceTester $I)
+    {
+        // Calling frontend redirects to installer
+        $I->amOnPage('/');
+
+        // EnvironmentAndFolders step
+        $I->waitForText('Installing TYPO3');
+        $I->waitForText('System looks good. Continue!');
+        $I->click('System looks good. Continue!');
+
+        // DatabaseConnection step
+        $I->waitForText('Database connection');
+        $I->selectOption('#t3js-connect-database-driver', 'Manually configured PostgreSQL connection');
+        $I->fillField('#t3-install-step-postgresManualConfiguration-username', getenv('typo3DatabaseUsername'));
+        // password intentionally not filled. Postgres authenticates with the shell user.
+        $I->fillField('#t3-install-step-postgresManualConfiguration-database', getenv('typo3DatabaseName') . '_atipgsql');
+        $I->click('Continue');
+
+        // DatabaseData step
+        $I->waitForText('Create user and import base data');
+        $I->fillField('#username', 'admin');
+        $I->fillField('#password', 'password');
+        $I->click('Continue');
+
+        // DefaultConfiguration step - load distributions
+        $I->waitForText('Installation done!');
+        $I->click('#create-site');
+        $I->click('Open the TYPO3 Backend');
+
+        // Verify backend login successful
+        $I->waitForElement('#t3-username');
+        $I->fillField('#t3-username', 'admin');
+        $I->fillField('#t3-password', 'password');
+        $I->click('#t3-login-submit-section > button');
+        $I->waitForElement('.nav', 30);
+        $I->waitForElement('.scaffold-content iframe', 30);
+        $I->seeCookie('be_lastLoginProvider');
+        $I->seeCookie('be_typo_user');
+
+        // Verify default frontend is rendered
+        $I->amOnPage('/');
+        $I->waitForText('Welcome to a default website made with TYPO3');
+    }
+}
diff --git a/typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlCest.php b/typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlCest.php
deleted file mode 100644 (file)
index 4f5e030..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-namespace TYPO3\CMS\Core\Tests\AcceptanceInstallPsql;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Click through installer, go to backend, install introduction package
- */
-class InstallWithPgsqlCest
-{
-    /**
-     * @param \AcceptanceTester $I
-     */
-    public function installTypo3OnPgSql(\AcceptanceTester $I)
-    {
-        // Calling frontend redirects to installer
-        $I->amOnPage('/');
-
-        // EnvironmentAndFolders step
-        $I->waitForText('Installing TYPO3');
-        $I->see('System looks good. Continue!');
-        $I->click('System looks good. Continue!');
-
-        // DatabaseConnection step
-        $I->waitForText('Database connection');
-        $I->selectOption('#t3js-connect-database-driver', 'Manually configured PostgreSQL connection');
-        $I->fillField('#t3-install-step-postgresManualConfiguration-username', getenv('typo3DatabaseUsername'));
-        // password intentionally not filled. Postgres authenticates with the shell user.
-        $I->fillField('#t3-install-step-postgresManualConfiguration-database', getenv('typo3DatabaseName') . '_atipgsql');
-        $I->click('Continue');
-
-        // DatabaseData step
-        $I->waitForText('Create user and import base data');
-        $I->fillField('#username', 'admin');
-        $I->fillField('#password', 'password');
-        $I->click('Continue');
-
-        // DefaultConfiguration step - load distributions
-        $I->waitForText('Installation done!');
-        $I->click('#load-distributions');
-        $I->click('Open the TYPO3 Backend');
-
-        // Verify backend login successful
-        $I->waitForElement('#t3-username');
-        $I->fillField('#t3-username', 'admin');
-        $I->fillField('#t3-password', 'password');
-        $I->click('#t3-login-submit-section > button');
-        $I->waitForElement('.nav', 30);
-        $I->waitForElement('.scaffold-content iframe', 30);
-        $I->seeCookie('be_lastLoginProvider');
-        $I->seeCookie('be_typo_user');
-
-        // Loading might take some time
-        $I->switchToIFrame('list_frame');
-        $I->waitForText('Get preconfigured distribution', 30);
-        $I->click('.t3-button-action-installdistribution');
-        $I->waitForText('You successfully installed the distribution:introduction', 30);
-
-        // Verify default frontend is rendered
-        $I->amOnPage('/');
-        $I->waitForText('Let us introduce you to TYPO3', 30);
-        $I->waitForText('Make it your own');
-
-        // Verify link
-        $I->click('[title="Features"]');
-        $I->waitForText('Feature Complete Out-of-the-box', 30);
-    }
-}
diff --git a/typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlIntroductionPackageCest.php b/typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlIntroductionPackageCest.php
new file mode 100644 (file)
index 0000000..f7fb250
--- /dev/null
@@ -0,0 +1,79 @@
+<?php
+namespace TYPO3\CMS\Core\Tests\AcceptanceInstallPsql;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Click through installer, go to backend, install introduction package
+ */
+class InstallWithPgsqlIntroductionPackageCest
+{
+    /**
+     * @param \AcceptanceTester $I
+     */
+    public function installTypo3OnPgSql(\AcceptanceTester $I)
+    {
+        // Calling frontend redirects to installer
+        $I->amOnPage('/');
+
+        // EnvironmentAndFolders step
+        $I->waitForText('Installing TYPO3');
+        $I->see('System looks good. Continue!');
+        $I->click('System looks good. Continue!');
+
+        // DatabaseConnection step
+        $I->waitForText('Database connection');
+        $I->selectOption('#t3js-connect-database-driver', 'Manually configured PostgreSQL connection');
+        $I->fillField('#t3-install-step-postgresManualConfiguration-username', getenv('typo3DatabaseUsername'));
+        // password intentionally not filled. Postgres authenticates with the shell user.
+        $I->fillField('#t3-install-step-postgresManualConfiguration-database', getenv('typo3DatabaseName') . '_atipgsql');
+        $I->click('Continue');
+
+        // DatabaseData step
+        $I->waitForText('Create user and import base data');
+        $I->fillField('#username', 'admin');
+        $I->fillField('#password', 'password');
+        $I->click('Continue');
+
+        // DefaultConfiguration step - load distributions
+        $I->waitForText('Installation done!');
+        $I->click('#load-distributions');
+        $I->click('Open the TYPO3 Backend');
+
+        // Verify backend login successful
+        $I->waitForElement('#t3-username');
+        $I->fillField('#t3-username', 'admin');
+        $I->fillField('#t3-password', 'password');
+        $I->click('#t3-login-submit-section > button');
+        $I->waitForElement('.nav', 30);
+        $I->waitForElement('.scaffold-content iframe', 30);
+        $I->seeCookie('be_lastLoginProvider');
+        $I->seeCookie('be_typo_user');
+
+        // Loading might take some time
+        $I->switchToIFrame('list_frame');
+        $I->waitForText('Get preconfigured distribution', 30);
+        $I->click('.t3-button-action-installdistribution');
+        $I->waitForText('You successfully installed the distribution:introduction', 30);
+
+        // Verify default frontend is rendered
+        $I->amOnPage('/');
+        $I->waitForText('Let us introduce you to TYPO3', 30);
+        $I->waitForText('Make it your own');
+
+        // Verify link
+        $I->click('[title="Features"]');
+        $I->waitForText('Feature Complete Out-of-the-box', 30);
+    }
+}