From 96e44476a788615eafc3e1d908b89d3858f30bbe Mon Sep 17 00:00:00 2001 From: Jochen Roth <jochen.roth@b13.com> Date: Fri, 13 Aug 2021 13:31:31 +0200 Subject: [PATCH] [TASK] Rename Acceptance test suite from Backend to Application Now that we have frontend tests in the Backend suite the name Backend for acceptance suite does not fit anymore. So the suite name was changed from Backend to Application. Resolves: #94864 Releases: master Change-Id: Ib52053f6dbbfad9b7fef1ff11e81110cffa010b2 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70550 Tested-by: core-ci <typo3@b13.com> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de> --- Build/Scripts/duplicateExceptionCodeCheck.sh | 2 +- Build/Scripts/runTests.sh | 18 +++---- Build/Scripts/splitAcceptanceTests.php | 4 +- Build/gitlab-ci.yml | 4 +- ...backend.yml => acceptance-application.yml} | 12 ++--- ...backend.yml => acceptance-application.yml} | 4 +- Build/testing-docker/local/docker-compose.yml | 24 ++++----- ...ackend.suite.yml => Application.suite.yml} | 2 +- .../BackendUser/CompareUserCest.php | 12 ++--- .../BackendUser/ListGroupCest.php | 20 ++++---- .../BackendUser/ListUserCest.php | 44 ++++++++-------- .../ConfigurationModuleProviderCest.php | 20 ++++---- .../Dashboard/DashboardModuleCest.php | 20 ++++---- .../DbCheck/DbCheckModuleCest.php | 36 ++++++------- .../Extensionmanager/GetExtensionsCest.php | 24 ++++----- .../InstalledExtensionsCest.php | 20 ++++---- .../FileList/AbstractFileCest.php | 20 ++++---- .../FileList/FileClipboardCest.php | 20 ++++---- .../FileList/FileMetaDataCest.php | 12 ++--- .../FileList/FileOperationsCest.php | 12 ++--- .../FileList/FileStorageTreeFilterCest.php | 16 +++--- .../FormEngine/AbstractElementsBasicCest.php | 18 +++---- .../FormEngine/CategoryTreeCest.php | 16 +++--- .../FormEngine/ElementsBasicInputDateCest.php | 24 ++++----- .../FormEngine/ElementsBasicInputEvalCest.php | 12 ++--- .../ElementsBasicInputRangeCest.php | 12 ++--- .../ElementsBasicInputSimpleCest.php | 12 ++--- .../ElementsBasicInputTextTableCest.php | 32 ++++++------ .../FormEngine/ElementsGroupCest.php | 24 ++++----- .../FormEngine/FalMetadataCest.php | 24 ++++----- .../FormEngine/Inline1nCest.php | 22 ++++---- .../FormEngine/InlineFalCest.php | 20 ++++---- .../FormEngine/NullPlaceholderCest.php | 16 +++--- .../Frontend/ContentElementsCest.php | 12 ++--- .../Frontend/FormFrameworkCest.php | 16 +++--- .../Frontend/FrontendLoginCest.php | 16 +++--- .../Frontend/IndexedSearchCest.php | 16 +++--- .../General/ModuleMenuCest.php | 16 +++--- .../Impexp/AbstractCest.php | 14 +++--- .../Impexp/ExportCest.php | 38 +++++++------- .../Impexp/Fixtures/404_page_and_records.xml | 0 .../Impexp/Fixtures/sys_category_record.xml | 0 .../Impexp/Fixtures/sys_category_table.xml | 0 ..._category_table_with_bootstrap_package.xml | 0 .../Impexp/Fixtures/unsupported.json | 0 .../Impexp/ImportCest.php | 50 +++++++++---------- .../Impexp/UsersCest.php | 28 +++++------ .../IndexedSearch/IndexedSearchModuleCest.php | 12 ++--- .../Info/InfoModuleCest.php | 24 ++++----- .../InstallTool/AbstractCest.php | 14 +++--- .../InstallTool/EnvironmentCest.php | 10 ++-- .../InstallTool/LoginCest.php | 8 +-- .../InstallTool/MaintenanceCest.php | 38 +++++++------- .../InstallTool/SettingsCest.php | 34 ++++++------- .../InstallTool/UpgradeCest.php | 34 ++++++------- .../Login/BackendLoginCest.php | 30 +++++------ .../Page/AddPageInPageModuleCest.php | 12 ++--- .../Page/PageModuleCest.php | 20 ++++---- .../PageCreationWithDragAndDropCest.php | 24 ++++----- .../SelectPagetreeWithKeyboardCest.php | 32 ++++++------ .../PageTree/PageTreeFilterCest.php | 26 +++++----- .../RecordList/RecordDownloadCest.php | 12 ++--- .../RecordList/SysNoteCest.php | 12 ++--- .../Redirect/RedirectModuleCest.php | 20 ++++---- .../Report/ReportModuleCest.php | 16 +++--- .../Scheduler/TasksCest.php | 40 +++++++-------- .../Site/SiteModuleCest.php | 24 ++++----- .../Template/TemplateCest.php | 16 +++--- .../Topbar/BookmarkCest.php | 36 ++++++------- .../Topbar/FlushCest.php | 18 +++---- .../Topbar/HelpCest.php | 26 +++++----- .../Topbar/LogoCest.php | 12 ++--- .../Topbar/ModuleMenuButtonCest.php | 16 +++--- .../Topbar/NavigationComponentTreeCest.php | 16 +++--- .../Topbar/SearchCest.php | 20 ++++---- .../Topbar/SetupCest.php | 18 +++---- .../Topbar/UsernameOnAvatarCest.php | 10 ++-- .../Workspace/WorkspaceModuleCest.php | 20 ++++---- ...ackendTester.php => ApplicationTester.php} | 6 +-- .../Acceptance/Support/Helper/FileTree.php | 6 +-- .../Acceptance/Support/Helper/ModalDialog.php | 6 +-- .../Tests/Acceptance/Support/Helper/Mouse.php | 6 +-- .../Acceptance/Support/Helper/PageTree.php | 6 +-- 83 files changed, 732 insertions(+), 732 deletions(-) rename Build/gitlab-ci/nightly/{acceptance-backend.yml => acceptance-application.yml} (90%) rename Build/gitlab-ci/pre-merge/{acceptance-backend.yml => acceptance-application.yml} (88%) rename typo3/sysext/core/Tests/Acceptance/{Backend.suite.yml => Application.suite.yml} (95%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/BackendUser/CompareUserCest.php (88%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/BackendUser/ListGroupCest.php (80%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/BackendUser/ListUserCest.php (87%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/ConfigurationModule/ConfigurationModuleProviderCest.php (86%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Dashboard/DashboardModuleCest.php (84%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/DbCheck/DbCheckModuleCest.php (82%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Extensionmanager/GetExtensionsCest.php (83%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Extensionmanager/InstalledExtensionsCest.php (84%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FileList/AbstractFileCest.php (78%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FileList/FileClipboardCest.php (82%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FileList/FileMetaDataCest.php (79%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FileList/FileOperationsCest.php (89%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FileList/FileStorageTreeFilterCest.php (85%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/AbstractElementsBasicCest.php (90%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/CategoryTreeCest.php (84%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/ElementsBasicInputDateCest.php (91%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/ElementsBasicInputEvalCest.php (94%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/ElementsBasicInputRangeCest.php (91%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/ElementsBasicInputSimpleCest.php (95%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/ElementsBasicInputTextTableCest.php (89%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/ElementsGroupCest.php (91%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/FalMetadataCest.php (95%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/Inline1nCest.php (91%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/InlineFalCest.php (82%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/FormEngine/NullPlaceholderCest.php (86%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Frontend/ContentElementsCest.php (96%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Frontend/FormFrameworkCest.php (87%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Frontend/FrontendLoginCest.php (85%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Frontend/IndexedSearchCest.php (87%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/General/ModuleMenuCest.php (82%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/AbstractCest.php (87%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/ExportCest.php (93%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/Fixtures/404_page_and_records.xml (100%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/Fixtures/sys_category_record.xml (100%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/Fixtures/sys_category_table.xml (100%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml (100%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/Fixtures/unsupported.json (100%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/ImportCest.php (89%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Impexp/UsersCest.php (90%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/IndexedSearch/IndexedSearchModuleCest.php (86%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Info/InfoModuleCest.php (73%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/InstallTool/AbstractCest.php (85%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/InstallTool/EnvironmentCest.php (81%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/InstallTool/LoginCest.php (94%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/InstallTool/MaintenanceCest.php (76%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/InstallTool/SettingsCest.php (89%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/InstallTool/UpgradeCest.php (84%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Login/BackendLoginCest.php (86%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Page/AddPageInPageModuleCest.php (93%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Page/PageModuleCest.php (81%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php (82%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php (87%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/PageTree/PageTreeFilterCest.php (88%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/RecordList/RecordDownloadCest.php (85%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/RecordList/SysNoteCest.php (86%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Redirect/RedirectModuleCest.php (83%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Report/ReportModuleCest.php (73%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Scheduler/TasksCest.php (85%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Site/SiteModuleCest.php (95%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Template/TemplateCest.php (93%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/BookmarkCest.php (83%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/FlushCest.php (74%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/HelpCest.php (76%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/LogoCest.php (69%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/ModuleMenuButtonCest.php (87%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/NavigationComponentTreeCest.php (82%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/SearchCest.php (84%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/SetupCest.php (74%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Topbar/UsernameOnAvatarCest.php (74%) rename typo3/sysext/core/Tests/Acceptance/{Backend => Application}/Workspace/WorkspaceModuleCest.php (83%) rename typo3/sysext/core/Tests/Acceptance/Support/{BackendTester.php => ApplicationTester.php} (79%) diff --git a/Build/Scripts/duplicateExceptionCodeCheck.sh b/Build/Scripts/duplicateExceptionCodeCheck.sh index 8756f4c655af..618295154a08 100755 --- a/Build/Scripts/duplicateExceptionCodeCheck.sh +++ b/Build/Scripts/duplicateExceptionCodeCheck.sh @@ -18,7 +18,7 @@ scanPath="typo3/" ignoreFiles=() # auto generated file, shouldn't be checked -ignoreFiles+="sysext/core/Tests/Acceptance/Support/_generated/BackendTesterActions.php" +ignoreFiles+="sysext/core/Tests/Acceptance/Support/_generated/ApplicationTesterActions.php" ignoreFiles+="sysext/core/Tests/Acceptance/Support/_generated/InstallTesterActions.php" # an exception in here throws a code from a previous exception/error ignoreFiles+="sysext/extbase/Classes/Core/Bootstrap.php" diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index 5707df212281..6ba681b56b19 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -88,7 +88,7 @@ No arguments: Run all unit tests with PHP 7.4 Options: -s <...> Specifies which test suite to run - - acceptance: main backend acceptance tests + - acceptance: main application acceptance tests - acceptanceInstall: installation acceptance tests, only with -d mariadb|postgres|sqlite - buildCss: execute scss to css builder - buildJavascript: execute typescript to javascript builder @@ -247,8 +247,8 @@ Examples: # Run functional tests on postgres 11 ./Build/Scripts/runTests.sh -s functional -d postgres -k 11 - # Run restricted set of backend acceptance tests - ./Build/Scripts/runTests.sh -s acceptance typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php:loginButtonMouseOver + # Run restricted set of application acceptance tests + ./Build/Scripts/runTests.sh -s acceptance typo3/sysext/core/Tests/Acceptance/Application/Login/BackendLoginCest.php:loginButtonMouseOver # Run installer tests of a new instance on sqlite ./Build/Scripts/runTests.sh -s acceptanceInstall -d sqlite @@ -425,19 +425,19 @@ case ${TEST_SUITE} in case ${DBMS} in mysql) echo "Using driver: ${DATABASE_DRIVER}" - docker-compose run prepare_acceptance_backend_mysql - docker-compose run acceptance_backend_mysql + docker-compose run prepare_acceptance_application_mysql + docker-compose run acceptance_application_mysql SUITE_EXIT_CODE=$? ;; mariadb) echo "Using driver: ${DATABASE_DRIVER}" - docker-compose run prepare_acceptance_backend_mariadb - docker-compose run acceptance_backend_mariadb + docker-compose run prepare_acceptance_application_mariadb + docker-compose run acceptance_application_mariadb SUITE_EXIT_CODE=$? ;; postgres) - docker-compose run prepare_acceptance_backend_postgres - docker-compose run acceptance_backend_postgres + docker-compose run prepare_acceptance_application_postgres + docker-compose run acceptance_application_postgres SUITE_EXIT_CODE=$? ;; *) diff --git a/Build/Scripts/splitAcceptanceTests.php b/Build/Scripts/splitAcceptanceTests.php index 5bf0f957e9e8..a8129747c74f 100755 --- a/Build/Scripts/splitAcceptanceTests.php +++ b/Build/Scripts/splitAcceptanceTests.php @@ -45,7 +45,7 @@ require __DIR__ . '/../../vendor/autoload.php'; * Verbose output with 8 chunks: * ./Build/Scripts/splitAcceptanceTests.php 8 -v * - * It's purpose is to find all core Backend acceptance tests and split them into + * It's purpose is to find all core Application acceptance tests and split them into * pieces. In CI, there are for example 8 jobs for the ac tests and each picks one * chunk of tests. This way, acceptance tests are run in parallel * and thus reduce the overall runtime of the test suite. @@ -80,7 +80,7 @@ class SplitAcceptanceTests extends NodeVisitorAbstract // Find functional test files $testFiles = (new Finder()) ->files() - ->in(__DIR__ . '/../../typo3/sysext/core/Tests/Acceptance/Backend') + ->in(__DIR__ . '/../../typo3/sysext/core/Tests/Acceptance/Application') ->name('/Cest\.php$/') ->sortByName() ; diff --git a/Build/gitlab-ci.yml b/Build/gitlab-ci.yml index 738379f87b24..e118462b3c72 100644 --- a/Build/gitlab-ci.yml +++ b/Build/gitlab-ci.yml @@ -54,7 +54,7 @@ include: # turns this into a branch 'change-patchset' which executes the pipeline - local: 'Build/gitlab-ci/pre-merge/early.yml' - local: 'Build/gitlab-ci/pre-merge/acceptance-install.yml' - - local: 'Build/gitlab-ci/pre-merge/acceptance-backend.yml' + - local: 'Build/gitlab-ci/pre-merge/acceptance-application.yml' - local: 'Build/gitlab-ci/pre-merge/integrity.yml' - local: 'Build/gitlab-ci/pre-merge/functional.yml' - local: 'Build/gitlab-ci/pre-merge/unit.yml' @@ -62,5 +62,5 @@ include: - local: 'Build/gitlab-ci/nightly/integrity.yml' - local: 'Build/gitlab-ci/nightly/unit.yml' - local: 'Build/gitlab-ci/nightly/acceptance-install.yml' - - local: 'Build/gitlab-ci/nightly/acceptance-backend.yml' + - local: 'Build/gitlab-ci/nightly/acceptance-application.yml' - local: 'Build/gitlab-ci/nightly/functional.yml' diff --git a/Build/gitlab-ci/nightly/acceptance-backend.yml b/Build/gitlab-ci/nightly/acceptance-application.yml similarity index 90% rename from Build/gitlab-ci/nightly/acceptance-backend.yml rename to Build/gitlab-ci/nightly/acceptance-application.yml index 382ae0317d6d..c42fb2a46304 100644 --- a/Build/gitlab-ci/nightly/acceptance-backend.yml +++ b/Build/gitlab-ci/nightly/acceptance-application.yml @@ -1,4 +1,4 @@ -acceptance backend mariadb php 7.4 locked: +acceptance application mariadb php 7.4 locked: stage: acceptance only: - schedules @@ -11,7 +11,7 @@ acceptance backend mariadb php 7.4 locked: script: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s acceptance -d mariadb -i 10.3 -p 7.4 -c $CI_NODE_INDEX/$CI_NODE_TOTAL -acceptance backend mariadb php 7.4 max: +acceptance application mariadb php 7.4 max: stage: acceptance only: - schedules @@ -28,7 +28,7 @@ acceptance backend mariadb php 7.4 max: script: - Build/Scripts/runTests.sh -s composerInstallMax -p 7.4 - Build/Scripts/runTests.sh -s acceptance -d mariadb -i 10.3 -p 7.4 -c $CI_NODE_INDEX/$CI_NODE_TOTAL -acceptance backend mariadb php 7.4 min: +acceptance application mariadb php 7.4 min: stage: acceptance only: - schedules @@ -46,7 +46,7 @@ acceptance backend mariadb php 7.4 min: - Build/Scripts/runTests.sh -s composerInstallMin -p 7.4 - Build/Scripts/runTests.sh -s acceptance -d mariadb -i 10.3 -p 7.4 -c $CI_NODE_INDEX/$CI_NODE_TOTAL -acceptance backend mariadb php 8.0 locked: +acceptance application mariadb php 8.0 locked: stage: acceptance only: - schedules @@ -59,7 +59,7 @@ acceptance backend mariadb php 8.0 locked: script: - Build/Scripts/runTests.sh -s composerInstall -p 8.0 - Build/Scripts/runTests.sh -s acceptance -d mariadb -i 10.3 -p 8.0 -c $CI_NODE_INDEX/$CI_NODE_TOTAL -acceptance backend mariadb php 8.0 max: +acceptance application mariadb php 8.0 max: stage: acceptance only: - schedules @@ -76,7 +76,7 @@ acceptance backend mariadb php 8.0 max: script: - Build/Scripts/runTests.sh -s composerInstallMax -p 8.0 - Build/Scripts/runTests.sh -s acceptance -d mariadb -i 10.3 -p 8.0 -c $CI_NODE_INDEX/$CI_NODE_TOTAL -acceptance backend mariadb php 8.0 min: +acceptance application mariadb php 8.0 min: stage: acceptance only: - schedules diff --git a/Build/gitlab-ci/pre-merge/acceptance-backend.yml b/Build/gitlab-ci/pre-merge/acceptance-application.yml similarity index 88% rename from Build/gitlab-ci/pre-merge/acceptance-backend.yml rename to Build/gitlab-ci/pre-merge/acceptance-application.yml index de73891d4d8d..24ef42be8cf5 100644 --- a/Build/gitlab-ci/pre-merge/acceptance-backend.yml +++ b/Build/gitlab-ci/pre-merge/acceptance-application.yml @@ -1,4 +1,4 @@ -acceptance backend mariadb php 7.4 pre-merge: +acceptance application mariadb php 7.4 pre-merge: stage: main except: refs: @@ -14,7 +14,7 @@ acceptance backend mariadb php 7.4 pre-merge: - Build/Scripts/runTests.sh -s composerInstall -p 7.4 - Build/Scripts/runTests.sh -s acceptance -p 7.4 -d mariadb -i 10.3 -c $CI_NODE_INDEX/$CI_NODE_TOTAL -acceptance backend mariadb php 8.0 pre-merge: +acceptance application mariadb php 8.0 pre-merge: stage: main except: refs: diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml index 98d3774db438..28b5d7d07fdf 100644 --- a/Build/testing-docker/local/docker-compose.yml +++ b/Build/testing-docker/local/docker-compose.yml @@ -68,7 +68,7 @@ services: working_dir: ${CORE_ROOT} command: php -dxdebug.mode=off Build/Scripts/splitAcceptanceTests.php -v ${CHUNKS} - prepare_acceptance_backend_mariadb: + prepare_acceptance_application_mariadb: image: alpine:3.8 links: - mariadb @@ -85,7 +85,7 @@ services: done; echo Database is up; " - acceptance_backend_mariadb: + acceptance_application_mariadb: image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest user: "${HOST_UID}" environment: @@ -107,9 +107,9 @@ services: php -v | grep '^PHP' if [ ${CHUNKS} -gt 0 ]; then echo \"Running chunk ${THISCHUNK}\" - COMMAND=\"bin/codecept run Backend -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" + COMMAND=\"bin/codecept run Application -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" else - COMMAND=\"bin/codecept run Backend -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" + COMMAND=\"bin/codecept run Application -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" fi mkdir -p typo3temp/var/tests/ if [ ${PHP_XDEBUG_ON} -eq 0 ]; then @@ -124,7 +124,7 @@ services: fi " - prepare_acceptance_backend_mysql: + prepare_acceptance_application_mysql: image: alpine:3.8 links: - mysql @@ -141,7 +141,7 @@ services: done; echo Database is up; " - acceptance_backend_mysql: + acceptance_application_mysql: image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest user: "${HOST_UID}" environment: @@ -163,9 +163,9 @@ services: php -v | grep '^PHP' if [ ${CHUNKS} -gt 0 ]; then echo \"Running chunk ${THISCHUNK}\" - COMMAND=\"bin/codecept run Backend -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" + COMMAND=\"bin/codecept run Application -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" else - COMMAND=\"bin/codecept run Backend -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" + COMMAND=\"bin/codecept run Application -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" fi mkdir -p typo3temp/var/tests/ if [ ${PHP_XDEBUG_ON} -eq 0 ]; then @@ -180,7 +180,7 @@ services: fi " - prepare_acceptance_backend_postgres: + prepare_acceptance_application_postgres: image: alpine:3.8 links: - postgres @@ -197,7 +197,7 @@ services: done; echo Database is up; " - acceptance_backend_postgres: + acceptance_application_postgres: image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest user: "${HOST_UID}" volumes: @@ -222,9 +222,9 @@ services: php -v | grep '^PHP' if [ ${CHUNKS} -gt 0 ]; then echo \"Running chunk ${THISCHUNK}\" - COMMAND=\"bin/codecept run Backend -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" + COMMAND=\"bin/codecept run Application -d -g AcceptanceTests-Job-${THISCHUNK} -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" else - COMMAND=\"bin/codecept run Backend -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" + COMMAND=\"bin/codecept run Application -d -c typo3/sysext/core/Tests/codeception.yml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} --xml reports.xml --html reports.html\" fi mkdir -p typo3temp/var/tests/ if [ ${PHP_XDEBUG_ON} -eq 0 ]; then diff --git a/typo3/sysext/core/Tests/Acceptance/Backend.suite.yml b/typo3/sysext/core/Tests/Acceptance/Application.suite.yml similarity index 95% rename from typo3/sysext/core/Tests/Acceptance/Backend.suite.yml rename to typo3/sysext/core/Tests/Acceptance/Application.suite.yml index ec007f184723..fada46475782 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend.suite.yml +++ b/typo3/sysext/core/Tests/Acceptance/Application.suite.yml @@ -1,4 +1,4 @@ -class_name: BackendTester +class_name: ApplicationTester modules: enabled: - WebDriver: diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/CompareUserCest.php b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php similarity index 88% rename from typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/CompareUserCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php index 88e9201546ce..7b0c629e0f63 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/CompareUserCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\BackendUser; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\BackendUser; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests concerning the compare view of BE user module @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class CompareUserCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -37,9 +37,9 @@ class CompareUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function editingBeUserRecordsFromCompareViewWorks(BackendTester $I) + public function editingBeUserRecordsFromCompareViewWorks(ApplicationTester $I) { // put two users into compare list $I->see('Backend User Listing'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListGroupCest.php b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListGroupCest.php similarity index 80% rename from typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListGroupCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListGroupCest.php index 2bc012f3d940..3e8db881c4ba 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListGroupCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListGroupCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\BackendUser; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\BackendUser; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests concerning the listing of BeUser groups @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class ListGroupCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -41,9 +41,9 @@ class ListGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canEditBeGroupsFromListView(BackendTester $I) + public function canEditBeGroupsFromListView(ApplicationTester $I) { $groupname = $I->grabTextFrom('table.table-striped > tbody > tr:nth-child(1) > td.title > a > b'); @@ -57,9 +57,9 @@ class ListGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canEditSubGroupFromListView(BackendTester $I) + public function canEditSubGroupFromListView(ApplicationTester $I) { $I->amGoingTo('test the subgroup edit form'); $groupname = $I->grabTextFrom('table.table-striped > tbody > tr:nth-child(2) > td:nth-child(3) > a:nth-child(1)'); @@ -68,10 +68,10 @@ class ListGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $groupName */ - private function openAndCloseTheEditForm(BackendTester $I, string $groupName): void + private function openAndCloseTheEditForm(ApplicationTester $I, string $groupName): void { $I->waitForText('Edit Backend usergroup "' . $groupName . '" on root level', 120); $I->see('Edit Backend usergroup "' . $groupName . '" on root level', 'h1'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php similarity index 87% rename from typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php index d530d2d65529..b763e745419f 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/BackendUser/ListUserCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\BackendUser; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\BackendUser; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * List User tests @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class ListUserCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -38,9 +38,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function showsHeadingAndListsBackendUsers(BackendTester $I) + public function showsHeadingAndListsBackendUsers(ApplicationTester $I) { $I->see('Backend User Listing'); @@ -52,9 +52,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function filterUsersByUsername(BackendTester $I) + public function filterUsersByUsername(ApplicationTester $I) { $I->wantTo('See the table of users'); $I->waitForElementVisible('#typo3-backend-user-list'); @@ -81,9 +81,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function filterUsersByAdmin(BackendTester $I) + public function filterUsersByAdmin(ApplicationTester $I) { $I->wantTo('See the table of users'); $I->waitForElementVisible('#typo3-backend-user-list'); @@ -110,9 +110,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function filterUsersByStatus(BackendTester $I) + public function filterUsersByStatus(ApplicationTester $I) { $I->wantTo('See the table of users'); $I->waitForElementVisible('#typo3-backend-user-list'); @@ -139,9 +139,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function filterUsersByLogin(BackendTester $I) + public function filterUsersByLogin(ApplicationTester $I) { $I->wantTo('See the table of users'); $I->waitForElementVisible('#typo3-backend-user-list'); @@ -168,9 +168,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function filterUsersByUserGroup(BackendTester $I) + public function filterUsersByUserGroup(ApplicationTester $I) { $I->wantTo('See the table of users'); $I->waitForElementVisible('#typo3-backend-user-list'); @@ -189,9 +189,9 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canEditUsersFromIndexListView(BackendTester $I) + public function canEditUsersFromIndexListView(ApplicationTester $I) { $I->canSee('Backend User Listing', 'h1'); $username = $I->grabTextFrom('#typo3-backend-user-list > tbody > tr:nth-child(1) > td.col-title > a:nth-child(1) > b'); @@ -210,10 +210,10 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param int $countOfUsers */ - private function checkCountOfUsers(BackendTester $I, int $countOfUsers) + private function checkCountOfUsers(ApplicationTester $I, int $countOfUsers) { $I->canSeeNumberOfElements('#typo3-backend-user-list tbody tr', $countOfUsers); $I->wantToTest('If a number of users is shown in the footer row'); @@ -222,10 +222,10 @@ class ListUserCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $username */ - private function openAndCloseTheEditForm(BackendTester $I, string $username): void + private function openAndCloseTheEditForm(ApplicationTester $I, string $username): void { $I->waitForElementNotVisible('#t3js-ui-block'); $I->canSee('Edit Backend user "' . $username . '" on root level'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/ConfigurationModule/ConfigurationModuleProviderCest.php b/typo3/sysext/core/Tests/Acceptance/Application/ConfigurationModule/ConfigurationModuleProviderCest.php similarity index 86% rename from typo3/sysext/core/Tests/Acceptance/Backend/ConfigurationModule/ConfigurationModuleProviderCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/ConfigurationModule/ConfigurationModuleProviderCest.php index b2fbdb2bcd97..5df49738bc70 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/ConfigurationModule/ConfigurationModuleProviderCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/ConfigurationModule/ConfigurationModuleProviderCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\ConfigurationModule; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\ConfigurationModule; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Configuration module provider tests @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class ConfigurationModuleProviderCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I): void + public function _before(ApplicationTester $I): void { $I->useExistingSession('admin'); $I->scrollTo('#system_config'); @@ -37,9 +37,9 @@ class ConfigurationModuleProviderCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function selectAndDisplayConfiguration(BackendTester $I): void + public function selectAndDisplayConfiguration(ApplicationTester $I): void { // Module can be accessed $I->see('Configuration', 'h1'); @@ -70,9 +70,9 @@ class ConfigurationModuleProviderCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canOpenTreeNodeAndScrollTo(BackendTester $I): void + public function canOpenTreeNodeAndScrollTo(ApplicationTester $I): void { $I->selectOption('select[name=tree]', '$GLOBALS[\'TYPO3_CONF_VARS\'] (Global Configuration)'); $I->click('.list-tree > li:first-child .list-tree-control'); @@ -81,9 +81,9 @@ class ConfigurationModuleProviderCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeAllPagesInDropDown(BackendTester $I): void + public function seeAllPagesInDropDown(ApplicationTester $I): void { foreach ($this->dropDownPagesDataProvider() as $item) { $I->selectOption('select[name=tree]', $item); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Dashboard/DashboardModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php similarity index 84% rename from typo3/sysext/core/Tests/Acceptance/Backend/Dashboard/DashboardModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php index fcfb368858d7..232d39364245 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Dashboard/DashboardModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Info; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Info; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; /** @@ -32,9 +32,9 @@ class DashboardModuleCest protected static string $widgetTitleSelector = '.widget-content-title'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); $I->click('#dashboard'); @@ -42,9 +42,9 @@ class DashboardModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeInitialDashboardAndWidgets(BackendTester $I) + public function seeInitialDashboardAndWidgets(ApplicationTester $I) { $I->see(self::$defaultDashboardTitle, self::$dashboardActiveSelector); $I->see('About TYPO3', self::$widgetTitleSelector); @@ -53,10 +53,10 @@ class DashboardModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function createCustomDashboardAndWidgets(BackendTester $I, ModalDialog $modalDialog) + public function createCustomDashboardAndWidgets(ApplicationTester $I, ModalDialog $modalDialog) { // Create Dashboard $I->click('.dashboard-button-tab-add'); @@ -78,10 +78,10 @@ class DashboardModuleCest /** * @depends createCustomDashboardAndWidgets - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function deleteDashboardAndWidgets(BackendTester $I, ModalDialog $modalDialog) + public function deleteDashboardAndWidgets(ApplicationTester $I, ModalDialog $modalDialog) { // Delete widget $I->click(self::$customDashboardTitle, '.dashboard-tabs'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/DbCheck/DbCheckModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/DbCheck/DbCheckModuleCest.php similarity index 82% rename from typo3/sysext/core/Tests/Acceptance/Backend/DbCheck/DbCheckModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/DbCheck/DbCheckModuleCest.php index 617fa77510f5..c70e1975ebb9 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/DbCheck/DbCheckModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/DbCheck/DbCheckModuleCest.php @@ -15,11 +15,11 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\DbCheck; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\DbCheck; use Facebook\WebDriver\Remote\RemoteWebDriver; use Facebook\WebDriver\Remote\RemoteWebElement; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; /** @@ -30,9 +30,9 @@ class DbCheckModuleCest protected static string $defaultDashboardTitle = 'My Dashboard'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); $I->click('#system_dbint'); @@ -40,9 +40,9 @@ class DbCheckModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeOverview(BackendTester $I) + public function seeOverview(ApplicationTester $I) { $I->see('Database integrity check', 'h1'); $I->see('Records Statistics', 'a'); @@ -52,9 +52,9 @@ class DbCheckModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeRecordStatistics(BackendTester $I) + public function seeRecordStatistics(ApplicationTester $I) { $this->goToPageAndSeeHeadline($I, 'Record Statistics', 'Records Statistics'); @@ -66,9 +66,9 @@ class DbCheckModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeDatabaseRelations(BackendTester $I) + public function seeDatabaseRelations(ApplicationTester $I) { $this->goToPageAndSeeHeadline($I, 'Database Relations', 'Relations'); $I->see('Select fields', 'h2'); @@ -76,9 +76,9 @@ class DbCheckModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeFullSearch(BackendTester $I, ModalDialog $modalDialog) + public function seeFullSearch(ApplicationTester $I, ModalDialog $modalDialog) { $this->goToPageAndSeeHeadline($I, 'Full search', 'Search whole Database'); $I->see('Search options', 'h2'); @@ -98,9 +98,9 @@ class DbCheckModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeManageReferenceIndex(BackendTester $I) + public function seeManageReferenceIndex(ApplicationTester $I) { $this->goToPageAndSeeHeadline($I, 'Manage Reference Index', 'Manage Reference Index'); @@ -158,9 +158,9 @@ class DbCheckModuleCest /** * @param string $select * @param string $headline - * @param BackendTester $I + * @param ApplicationTester $I */ - protected function goToPageAndSeeHeadline(BackendTester $I, string $select, string $headline): void + protected function goToPageAndSeeHeadline(ApplicationTester $I, string $select, string $headline): void { $I->selectOption('select[name=DatabaseJumpMenu]', $select); $I->see($headline, 'h1'); @@ -169,11 +169,11 @@ class DbCheckModuleCest /** * Find count of table row by name * - * @param BackendTester $I + * @param ApplicationTester $I * @param string $fieldLabel * @return RemoteWebElement */ - protected function getCountByRowName(BackendTester $I, string $rowName, int $sibling = 1): RemoteWebElement + protected function getCountByRowName(ApplicationTester $I, string $rowName, int $sibling = 1): RemoteWebElement { $I->comment('Get context for table row "' . $rowName . '"'); return $I->executeInSelenium( diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php similarity index 83% rename from typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php index a7bbe88201a6..ed5c59cf4e28 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/GetExtensionsCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/GetExtensionsCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Extensionmanager; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Extensionmanager; use Facebook\WebDriver\WebDriverKeys; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests for the "Get Extensions view" of the extension manager @@ -26,9 +26,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class GetExtensionsCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -44,27 +44,27 @@ class GetExtensionsCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkRetrievedExtensionsFromTerAreDisplayed(BackendTester $I) + public function checkRetrievedExtensionsFromTerAreDisplayed(ApplicationTester $I) { $I->see('superext'); $I->see('neededext'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkPageBrowserDisplaysTwoRecords(BackendTester $I) + public function checkPageBrowserDisplaysTwoRecords(ApplicationTester $I) { $I->seeElement('.pagination-wrap'); $I->see('Extensions 1 - 2'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkSearchFilterListFindsExtensionKey(BackendTester $I) + public function checkSearchFilterListFindsExtensionKey(ApplicationTester $I) { $I->fillField('input[name="tx_extensionmanager_tools_extensionmanagerextensionmanager[search]"]', 'superext'); $I->click('Go'); @@ -87,9 +87,9 @@ class GetExtensionsCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkSearchFilterListFindsPartOfExtensionKey(BackendTester $I) + public function checkSearchFilterListFindsPartOfExtensionKey(ApplicationTester $I) { $I->fillField('input[name="tx_extensionmanager_tools_extensionmanagerextensionmanager[search]"]', 'ext'); $I->click('Go'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/InstalledExtensionsCest.php similarity index 84% rename from typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/InstalledExtensionsCest.php index 8d9a06511a7e..0f1db846d85c 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Extensionmanager/InstalledExtensionsCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Extensionmanager; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Extensionmanager; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests for the "Install list view" of the extension manager @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class InstalledExtensionsCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -37,9 +37,9 @@ class InstalledExtensionsCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkSearchFiltersList(BackendTester $I) + public function checkSearchFiltersList(ApplicationTester $I) { $I->seeNumberOfElements('#typo3-extension-list tbody tr[role="row"]', [10, 100]); @@ -61,9 +61,9 @@ class InstalledExtensionsCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkIfUploadFormAppears(BackendTester $I) + public function checkIfUploadFormAppears(ApplicationTester $I) { $I->cantSeeElement('.module-body .extension-upload-form'); $I->click('a[title="Upload Extension .t3x/.zip"]', '.module-docheader'); @@ -71,9 +71,9 @@ class InstalledExtensionsCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkUninstallingAndInstallingAnExtension(BackendTester $I) + public function checkUninstallingAndInstallingAnExtension(ApplicationTester $I) { $I->wantTo('Check if uninstalling and installing an extension with backend module removes and adds the module from the module menu.'); $I->amGoingTo('uninstall extension belog'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/AbstractFileCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FileList/AbstractFileCest.php similarity index 78% rename from typo3/sysext/core/Tests/Acceptance/Backend/FileList/AbstractFileCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FileList/AbstractFileCest.php index 7bb5b741d813..ab159ea96da3 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/AbstractFileCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FileList/AbstractFileCest.php @@ -15,11 +15,11 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FileList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FileList; use Facebook\WebDriver\Remote\RemoteWebDriver; use Facebook\WebDriver\Remote\RemoteWebElement; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\FileTree; /** @@ -28,9 +28,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\FileTree; abstract class AbstractFileCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I, FileTree $tree) + public function _before(ApplicationTester $I, FileTree $tree) { $I->useExistingSession('admin'); $I->amOnPage('/typo3/module/file/FilelistList'); @@ -38,23 +38,23 @@ abstract class AbstractFileCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $name * @throws \Exception */ - protected function uploadFile(BackendTester $I, string $name): void + protected function uploadFile(ApplicationTester $I, string $name): void { $I->attachFile('input.upload-file-picker', 'Acceptance/Fixtures/Images/' . $name); $I->waitForElementNotVisible('.upload-queue-item .upload-queue-progress'); } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $title * @param string $action * @return RemoteWebElement */ - protected function getActionByTitle(BackendTester $I, string $title, string $action): RemoteWebElement + protected function getActionByTitle(ApplicationTester $I, string $title, string $action): RemoteWebElement { $I->comment('Get action in table row "' . $title . '"'); return $I->executeInSelenium( @@ -69,11 +69,11 @@ abstract class AbstractFileCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $title * @return RemoteWebElement */ - protected function openActionDropdown(BackendTester $I, string $title): RemoteWebElement + protected function openActionDropdown(ApplicationTester $I, string $title): RemoteWebElement { $I->comment('Get open action dropdown "' . $title . '"'); return $I->executeInSelenium( diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileClipboardCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileClipboardCest.php similarity index 82% rename from typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileClipboardCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FileList/FileClipboardCest.php index 2ab430644a34..9acac5fe059b 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileClipboardCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileClipboardCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FileList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FileList; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\FileTree; /** @@ -29,18 +29,18 @@ class FileClipboardCest extends AbstractFileCest protected string $copyModeMove = '#clipboard-copymode-move'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I, FileTree $tree) + public function _before(ApplicationTester $I, FileTree $tree) { parent::_before($I, $tree); $I->click('#checkClipBoard'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeSwitchModes(BackendTester $I) + public function seeSwitchModes(ApplicationTester $I) { $I->seeCheckboxIsChecked($this->copyModeMove); $I->dontSeeCheckboxIsChecked($this->copyModeCopy); @@ -50,9 +50,9 @@ class FileClipboardCest extends AbstractFileCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeAddRemoveSingleRecord(BackendTester $I) + public function seeAddRemoveSingleRecord(ApplicationTester $I) { $fileName = 'bus_lane.jpg'; $I->switchToMainFrame(); @@ -65,9 +65,9 @@ class FileClipboardCest extends AbstractFileCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeAddRemoveMultipleRecords(BackendTester $I) + public function seeAddRemoveMultipleRecords(ApplicationTester $I) { $expectedFiles = ['bus_lane.jpg', 'telephone_box.jpg', 'underground.jpg']; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileMetaDataCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileMetaDataCest.php similarity index 79% rename from typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileMetaDataCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FileList/FileMetaDataCest.php index f4d73c0dad06..ae883abc6475 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileMetaDataCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileMetaDataCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FileList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FileList; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Cases concerning sys_file_metadata records @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class FileMetaDataCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function metaDataCanBeEdited(BackendTester $I) + public function metaDataCanBeEdited(ApplicationTester $I) { $I->wantToTest('Metadata can be edited through search list results'); $I->click('Filelist'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileOperationsCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileOperationsCest.php similarity index 89% rename from typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileOperationsCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FileList/FileOperationsCest.php index 52b1cff81ad9..256f53bd050e 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileOperationsCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileOperationsCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FileList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FileList; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; /** @@ -26,9 +26,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; class FileOperationsCest extends AbstractFileCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function fileCrud(BackendTester $I, ModalDialog $modalDialog) + public function fileCrud(ApplicationTester $I, ModalDialog $modalDialog) { $fileTextareaSelector = 'textarea[name="data[editfile][0][data]"]'; $fileName = 'typo3-test.txt'; @@ -69,10 +69,10 @@ class FileOperationsCest extends AbstractFileCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function seeUploadFile(BackendTester $I) + public function seeUploadFile(ApplicationTester $I) { $alertContainer = '#alert-container'; $fileName = 'blue_mountains.jpg'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileStorageTreeFilterCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileStorageTreeFilterCest.php similarity index 85% rename from typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileStorageTreeFilterCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FileList/FileStorageTreeFilterCest.php index 51643df93cd7..334a57813db3 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FileList/FileStorageTreeFilterCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FileList/FileStorageTreeFilterCest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FileList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FileList; /* * This file is part of the TYPO3 CMS project. @@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FileList; * The TYPO3 project - inspiring people to share! */ -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\FileTree; class FileStorageTreeFilterCest @@ -28,7 +28,7 @@ class FileStorageTreeFilterCest protected string $withinTree = '#typo3-filestoragetree .nodes'; protected string $newSubfolder = 'random_subfolder'; - public function _before(BackendTester $I, FileTree $tree) + public function _before(ApplicationTester $I, FileTree $tree) { $I->useExistingSession('admin'); $I->click('Filelist'); @@ -39,7 +39,7 @@ class FileStorageTreeFilterCest $this->createNewFolder($I); } - public function filterTreeForFolder(BackendTester $I) + public function filterTreeForFolder(ApplicationTester $I) { $I->cantSeeElement($this->filterInputFieldClearButton); @@ -61,7 +61,7 @@ class FileStorageTreeFilterCest $I->seeInField($this->filterInputField, 'styleguide'); } - public function clearFilterReloadsTreeWithoutFilterApplied(BackendTester $I) + public function clearFilterReloadsTreeWithoutFilterApplied(ApplicationTester $I) { $I->fillField($this->filterInputField, 'styleguide'); $this->waitForAjaxRequestToFinish($I); @@ -76,21 +76,21 @@ class FileStorageTreeFilterCest $I->canSee($this->newSubfolder, $this->withinTree); } - protected function clearTreeFilters(BackendTester $I): void + protected function clearTreeFilters(ApplicationTester $I): void { $I->click($this->filterInputFieldClearButton); $I->click($this->reloadButton); $I->cantSeeElement($this->filterInputFieldClearButton); } - protected function waitForAjaxRequestToFinish(BackendTester $I): void + protected function waitForAjaxRequestToFinish(ApplicationTester $I): void { $I->waitForJS('return $.active == 0;', 10); // sometimes rendering is still slower that ajax being finished. $I->wait(0.5); } - protected function createNewFolder(BackendTester $I): void + protected function createNewFolder(ApplicationTester $I): void { // Create a new folder $I->switchToContentFrame(); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/AbstractElementsBasicCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/AbstractElementsBasicCest.php similarity index 90% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/AbstractElementsBasicCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/AbstractElementsBasicCest.php index 462e37fd1eaa..de8514b10485 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/AbstractElementsBasicCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/AbstractElementsBasicCest.php @@ -15,7 +15,7 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Codeception\Example; use Facebook\WebDriver\Exception\ElementClickInterceptedException; @@ -23,7 +23,7 @@ use Facebook\WebDriver\Exception\UnknownErrorException; use Facebook\WebDriver\Remote\RemoteWebDriver; use Facebook\WebDriver\Remote\RemoteWebElement; use Facebook\WebDriver\WebDriverKeys; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Abstract class for "elements_basic" tests of styleguide @@ -33,11 +33,11 @@ abstract class AbstractElementsBasicCest /** * Method to run basic elements input field test details * - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData * @throws \Exception */ - protected function runInputFieldTest(BackendTester $I, Example $testData) + protected function runInputFieldTest(ApplicationTester $I, Example $testData) { $fieldLabel = $testData['label']; $initializedInputFieldXpath = '(//label/code[contains(text(),"[' . $fieldLabel . ']")]/..)' @@ -111,11 +111,11 @@ abstract class AbstractElementsBasicCest /** * Find this element in form. * - * @param BackendTester $I + * @param ApplicationTester $I * @param string $fieldLabel * @return RemoteWebElement */ - protected function getFormSectionByFieldLabel(BackendTester $I, string $fieldLabel) + protected function getFormSectionByFieldLabel(ApplicationTester $I, string $fieldLabel) { $I->comment('Get context for field "' . $fieldLabel . '"'); return $I->executeInSelenium( @@ -130,11 +130,11 @@ abstract class AbstractElementsBasicCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $tabTitle the tab you want to click. If necessary, several attempts are made * @param string $referenceField one field that is available to receive a click. Will be used to scroll up from there. */ - protected function ensureTopOfFrameIsUsedAndClickTab(BackendTester $I, string $tabTitle, string $referenceField) + protected function ensureTopOfFrameIsUsedAndClickTab(ApplicationTester $I, string $tabTitle, string $referenceField) { try { $I->click($tabTitle); @@ -144,7 +144,7 @@ abstract class AbstractElementsBasicCest } } - protected function scrollToTopOfFrame(BackendTester $I, string $tabTitle, string $referenceField) + protected function scrollToTopOfFrame(ApplicationTester $I, string $tabTitle, string $referenceField) { $formSection = $this->getFormSectionByFieldLabel($I, $referenceField); $field = $this->getInputField($formSection); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/CategoryTreeCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/CategoryTreeCest.php similarity index 84% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/CategoryTreeCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/CategoryTreeCest.php index b6df9e1863a1..9e70b0a57bc8 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/CategoryTreeCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/CategoryTreeCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Category tree tests @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class CategoryTreeCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkIfCategoryListIsAvailable(BackendTester $I) + public function checkIfCategoryListIsAvailable(ApplicationTester $I) { // A sub-element of web module is show $I->waitForElementVisible('#web + .modulemenu-group-container .modulemenu-action'); @@ -46,9 +46,9 @@ class CategoryTreeCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function editCategoryItem(BackendTester $I) + public function editCategoryItem(ApplicationTester $I) { // A sub-element of web module is show $I->waitForElementVisible('#web + .modulemenu-group-container .modulemenu-action'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputDateCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputDateCest.php similarity index 91% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputDateCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputDateCest.php index 92b3130bcd2e..6b108febb254 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputDateCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputDateCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Codeception\Example; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -29,11 +29,11 @@ class ElementsBasicInputDateCest extends AbstractElementsBasicCest /** * Open list module of styleguide elements basic page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); @@ -91,11 +91,11 @@ class ElementsBasicInputDateCest extends AbstractElementsBasicCest /** * @dataProvider dbTypeDateEvalDateDataProvider - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData * @throws \Exception */ - public function dbTypeDateEvalDate(BackendTester $I, Example $testData) + public function dbTypeDateEvalDate(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } @@ -135,11 +135,11 @@ class ElementsBasicInputDateCest extends AbstractElementsBasicCest /** * @dataProvider dbTypeDateEvalDatetimeDataProvider - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData * @throws \Exception */ - public function dbTypeDateEvalDatetime(BackendTester $I, Example $testData) + public function dbTypeDateEvalDatetime(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } @@ -163,11 +163,11 @@ class ElementsBasicInputDateCest extends AbstractElementsBasicCest /** * @dataProvider dbTypeDateEvalTimeDataProvider - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData * @throws \Exception */ - public function dbTypeDateEvalTime(BackendTester $I, Example $testData) + public function dbTypeDateEvalTime(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } @@ -207,11 +207,11 @@ class ElementsBasicInputDateCest extends AbstractElementsBasicCest /** * @dataProvider dbTypeDateEvalTimeDataProvider_DbTypeDateTime - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData * @throws \Exception */ - public function checkThatValidationWorks_EvalDateTime_DbTypeDateTime(BackendTester $I, Example $testData) + public function checkThatValidationWorks_EvalDateTime_DbTypeDateTime(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputEvalCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputEvalCest.php similarity index 94% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputEvalCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputEvalCest.php index 00a1b9cc1b5b..2183fdf31f77 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputEvalCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputEvalCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Codeception\Example; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -29,10 +29,10 @@ class ElementsBasicInputEvalCest extends AbstractElementsBasicCest /** * Open list module of styleguide elements basic page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -169,10 +169,10 @@ class ElementsBasicInputEvalCest extends AbstractElementsBasicCest /** * @dataProvider simpleEvalInputFieldsDataProvider - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData */ - public function simpleEvalInputFields(BackendTester $I, Example $testData) + public function simpleEvalInputFields(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputRangeCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputRangeCest.php similarity index 91% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputRangeCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputRangeCest.php index 71afbab0b651..cb23821792dc 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputRangeCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputRangeCest.php @@ -15,12 +15,12 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Codeception\Example; use Facebook\WebDriver\Exception\ElementClickInterceptedException; use Facebook\WebDriver\Exception\UnknownServerException; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -31,10 +31,10 @@ class ElementsBasicInputRangeCest extends AbstractElementsBasicCest /** * Open list module of styleguide elements basic page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -112,10 +112,10 @@ class ElementsBasicInputRangeCest extends AbstractElementsBasicCest /** * @dataProvider simpleRangeAndMd5FieldsDataProvider - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData */ - public function simpleRangeAndMd5Fields(BackendTester $I, Example $testData) + public function simpleRangeAndMd5Fields(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputSimpleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputSimpleCest.php similarity index 95% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputSimpleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputSimpleCest.php index 4b167953e49a..f1363c8c4875 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputSimpleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputSimpleCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Codeception\Example; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -29,10 +29,10 @@ class ElementsBasicInputSimpleCest extends AbstractElementsBasicCest /** * Open list module of styleguide elements basic page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -197,10 +197,10 @@ class ElementsBasicInputSimpleCest extends AbstractElementsBasicCest /** * @dataProvider simpleInputFieldsDataProvider - * @param BackendTester $I + * @param ApplicationTester $I * @param Example $testData */ - public function simpleInputFields(BackendTester $I, Example $testData) + public function simpleInputFields(ApplicationTester $I, Example $testData) { $this->runInputFieldTest($I, $testData); } diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputTextTableCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputTextTableCest.php similarity index 89% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputTextTableCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputTextTableCest.php index 5ae6a196bdad..7194afa06802 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsBasicInputTextTableCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsBasicInputTextTableCest.php @@ -14,10 +14,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Facebook\WebDriver\WebDriverBy; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -30,11 +30,11 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest /** * Open styleguide elements basic page in list module * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); @@ -57,9 +57,9 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeTableWizardWithContent(BackendTester $I) + public function seeTableWizardWithContent(ApplicationTester $I) { $this->openTableWizard($I); $I->amGoingTo('check for correct data in each column'); @@ -72,9 +72,9 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function addAndRemoveTableColumnsAndRows(BackendTester $I) + public function addAndRemoveTableColumnsAndRows(ApplicationTester $I) { $this->openTableWizard($I); $elementCountSelector = '#typo3-tablewizard td input'; @@ -88,9 +88,9 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function moveTableColumnsAndRows(BackendTester $I) + public function moveTableColumnsAndRows(ApplicationTester $I) { $this->openTableWizard($I); $I->fillField('input[name="TABLE[c][0][0]"]', 'Test Column 1'); @@ -129,10 +129,10 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest * Click field resize button to see if * input fields change to textarea * - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function clickSmallFieldsButton(BackendTester $I) + public function clickSmallFieldsButton(ApplicationTester $I) { $this->openTableWizard($I); $fieldCount = 6; @@ -144,9 +144,9 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeTableWizardInitialWithoutContent(BackendTester $I) + public function seeTableWizardInitialWithoutContent(ApplicationTester $I) { $expectedRowFields = ['', '', '', '']; @@ -202,10 +202,10 @@ class ElementsBasicInputTextTableCest extends AbstractElementsBasicCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - private function openTableWizard(BackendTester $I) + private function openTableWizard(ApplicationTester $I) { $I->amGoingTo('open the table wizard'); $formSection = $this->getFormSectionByFieldLabel($I, 'text_17'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsGroupCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsGroupCest.php similarity index 91% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsGroupCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsGroupCest.php index c28b5cb4d2b3..feb1188cbec2 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/ElementsGroupCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/ElementsGroupCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -28,10 +28,10 @@ class ElementsGroupCest /** * Open list module of styleguide elements group page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); @@ -49,9 +49,9 @@ class ElementsGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function sortElementsInGroup(BackendTester $I) + public function sortElementsInGroup(ApplicationTester $I) { $fieldset = 'div.typo3-TCEforms > div:nth-of-type(1) > div:nth-of-type(1) > div:nth-of-type(1) > fieldset:nth-of-type(1)'; $formWizardsWrap = $fieldset . ' > div:nth-of-type(1) div.t3js-formengine-field-item > div:nth-of-type(1)'; @@ -94,9 +94,9 @@ class ElementsGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function addARecordWithRecordBrowserGroup(BackendTester $I) + public function addARecordWithRecordBrowserGroup(ApplicationTester $I) { $fieldset = 'div.typo3-TCEforms > div:nth-of-type(1) > div:nth-of-type(1) > div:nth-of-type(1) > fieldset:nth-of-type(1)'; $formWizardsWrap = $fieldset . ' > div:nth-of-type(1) div.t3js-formengine-field-item > div:nth-of-type(1)'; @@ -116,9 +116,9 @@ class ElementsGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function addTwoRecordWithRecordBrowserGroup(BackendTester $I) + public function addTwoRecordWithRecordBrowserGroup(ApplicationTester $I) { $fieldset = 'div.typo3-TCEforms > div:nth-of-type(1) > div:nth-of-type(1) > div:nth-of-type(1) > fieldset:nth-of-type(1)'; $formWizardsWrap = $fieldset . ' > div:nth-of-type(1) div.t3js-formengine-field-item > div:nth-of-type(1)'; @@ -140,9 +140,9 @@ class ElementsGroupCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function searchForARecordWithRecordBrowserGroup(BackendTester $I) + public function searchForARecordWithRecordBrowserGroup(ApplicationTester $I) { $fieldset = 'div.typo3-TCEforms > div:nth-of-type(1) > div:nth-of-type(1) > div:nth-of-type(1) > fieldset:nth-of-type(1)'; $formWizardsWrap = $fieldset . ' > div:nth-of-type(1) div.t3js-formengine-field-item > div:nth-of-type(1)'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/FalMetadataCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/FalMetadataCest.php similarity index 95% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/FalMetadataCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/FalMetadataCest.php index b55a3bc020ab..cbcaa5b67abb 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/FalMetadataCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/FalMetadataCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\FileTree; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -29,10 +29,10 @@ class FalMetadataCest /** * Call backend and open page module of styleguide page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $this->goToPageModule($I, $pageTree); @@ -46,12 +46,12 @@ class FalMetadataCest * - modifies image metadata * - checks if metadata is propagated to tt_content * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @param FileTree $fileTree * @throws \Exception */ - public function checkIfUpdatedFileMetadataIsUpdatedInContent(BackendTester $I, PageTree $pageTree, FileTree $fileTree) + public function checkIfUpdatedFileMetadataIsUpdatedInContent(ApplicationTester $I, PageTree $pageTree, FileTree $fileTree) { $I->amGoingTo('Create new CE with image'); $I->click('.t3js-page-new-ce a'); @@ -139,11 +139,11 @@ class FalMetadataCest * * test for https://forge.typo3.org/issues/81235 * - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception * @depends checkIfUpdatedFileMetadataIsUpdatedInContent */ - public function checkIfFileMetadataIsInheritedInContent(BackendTester $I) + public function checkIfFileMetadataIsInheritedInContent(ApplicationTester $I) { $I->amGoingTo('Create new CE with image with filled metadata'); $I->click('.t3js-page-new-ce a'); @@ -198,12 +198,12 @@ class FalMetadataCest /** * This scenario tests whether activating a null placeholder checkbox focuses its assigned text field * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @depends checkIfUpdatedFileMetadataIsUpdatedInContent * @throws \Exception */ - public function checkIfDeactivatingNullCheckboxesFocusesTextFields(BackendTester $I, PageTree $pageTree): void + public function checkIfDeactivatingNullCheckboxesFocusesTextFields(ApplicationTester $I, PageTree $pageTree): void { $I->amGoingTo('Check if deactivating null checkboxes focuses text fields'); $this->goToPageModule($I, $pageTree); @@ -242,10 +242,10 @@ class FalMetadataCest /** * Open page module of styleguide page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - private function goToPageModule(BackendTester $I, PageTree $pageTree) + private function goToPageModule(ApplicationTester $I, PageTree $pageTree) { $I->switchToMainFrame(); $I->click('Page'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/Inline1nCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/Inline1nCest.php similarity index 91% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/Inline1nCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/Inline1nCest.php index ab27954a64e4..5993d081b891 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/Inline1nCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/Inline1nCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; use Facebook\WebDriver\WebDriverKeys; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -30,11 +30,11 @@ class Inline1nCest /** * Open styleguide inline 1n page in list module * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); @@ -52,7 +52,7 @@ class Inline1nCest /** * @param Admin $I */ - public function checkIfExpandsAndCollapseShowInput(BackendTester $I) + public function checkIfExpandsAndCollapseShowInput(ApplicationTester $I) { $I->wantTo('Expands the inline Element'); $I->click('div[data-bs-toggle="formengine-inline"]', '[data-field-name^="[tx_styleguide_inline_1n_child]["]'); @@ -67,7 +67,7 @@ class Inline1nCest /** * @param Admin $I */ - public function hideAndUnhideInline1nInlineElement(BackendTester $I) + public function hideAndUnhideInline1nInlineElement(ApplicationTester $I) { $I->wantTo('Can hide a Inline Element'); $I->click('button span[data-identifier="actions-edit-hide"]', '[data-field-name^="[tx_styleguide_inline_1n_child]["]'); @@ -81,7 +81,7 @@ class Inline1nCest /** * @param Admin $I */ - public function createInline1nInlineElement(BackendTester $I) + public function createInline1nInlineElement(ApplicationTester $I) { $I->click('span[data-identifier="actions-add"]', 'div.typo3-newRecordLink'); @@ -109,7 +109,7 @@ class Inline1nCest * @depends createInline1nInlineElement * @param Admin $I */ - public function checkIfCanSortingInlineElement(BackendTester $I) + public function checkIfCanSortingInlineElement(ApplicationTester $I) { $I->wantTo('Can sort an Inline Element'); $I->click('button span[data-identifier="actions-move-down"]', '[data-field-name^="[tx_styleguide_inline_1n_child]["]'); @@ -131,7 +131,7 @@ class Inline1nCest /** * @param Admin $I */ - public function changeInline1nInlineInput(BackendTester $I) + public function changeInline1nInlineInput(ApplicationTester $I) { $I->click('div[data-bs-toggle="formengine-inline"]', '[data-field-name^="[tx_styleguide_inline_1n_child][1"]'); $I->waitForElement('input[data-formengine-input-name="data[tx_styleguide_inline_1n_child][1][input_1]"]'); @@ -147,7 +147,7 @@ class Inline1nCest * @param Admin $I * @param ModalDialog $modalDialog */ - public function deleteInline1nInlineElement(BackendTester $I, ModalDialog $modalDialog) + public function deleteInline1nInlineElement(ApplicationTester $I, ModalDialog $modalDialog) { $inlineElementToDelete = '[data-field-name^="[tx_styleguide_inline_1n_child][1"]'; $I->wantTo('Cancel the delete dialog'); @@ -174,7 +174,7 @@ class Inline1nCest * @param $fieldLabel * @param $testValue */ - protected function fillFieldByLabel(BackendTester $I, $fieldLabel, $testValue) + protected function fillFieldByLabel(ApplicationTester $I, $fieldLabel, $testValue) { $fieldContext = $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) use ( $fieldLabel diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/InlineFalCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/InlineFalCest.php similarity index 82% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/InlineFalCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/InlineFalCest.php index 5eb82a95399e..9c7230edc698 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/InlineFalCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/InlineFalCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -32,11 +32,11 @@ class InlineFalCest /** * Open styleguide inline fal page in list module * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); @@ -52,10 +52,10 @@ class InlineFalCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function seeFalRelationInfo(BackendTester $I, ModalDialog $modalDialog) + public function seeFalRelationInfo(ApplicationTester $I, ModalDialog $modalDialog) { $infoButtonSelector = '.tab-content button[data-action="infowindow"]'; @@ -68,9 +68,9 @@ class InlineFalCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function hideFalRelation(BackendTester $I) + public function hideFalRelation(ApplicationTester $I) { $hideButtonSelector = '.tab-content .t3js-toggle-visibility-button'; @@ -80,10 +80,10 @@ class InlineFalCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function deleteFalRelation(BackendTester $I, ModalDialog $modalDialog) + public function deleteFalRelation(ApplicationTester $I, ModalDialog $modalDialog) { $deleteButtonSelector = '.tab-content .t3js-editform-delete-inline-record'; $filename = $I->grabTextFrom(self::$filenameSelector); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/NullPlaceholderCest.php b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/NullPlaceholderCest.php similarity index 86% rename from typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/NullPlaceholderCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/FormEngine/NullPlaceholderCest.php index 1c7567d7a124..069fabb998c6 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/FormEngine/NullPlaceholderCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/FormEngine/NullPlaceholderCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\FormEngine; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\FormEngine; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -28,10 +28,10 @@ class NullPlaceholderCest /** * Call backend and open list module * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $this->goToListModule($I, $pageTree); @@ -40,10 +40,10 @@ class NullPlaceholderCest /** * This scenario tests whether activating a null placeholder checkbox marks its state as "changed" * - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function checkIfDeactivatingNullCheckboxesMarksAsChanged(BackendTester $I): void + public function checkIfDeactivatingNullCheckboxesMarksAsChanged(ApplicationTester $I): void { $I->amGoingTo('Check if deactivating null checkboxes marks as "changed"'); @@ -70,11 +70,11 @@ class NullPlaceholderCest /** * Open list module * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - private function goToListModule(BackendTester $I, PageTree $pageTree) + private function goToListModule(ApplicationTester $I, PageTree $pageTree) { $I->switchToMainFrame(); $I->click('List'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/ContentElementsCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/ContentElementsCest.php similarity index 96% rename from typo3/sysext/core/Tests/Acceptance/Backend/Frontend/ContentElementsCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Frontend/ContentElementsCest.php index a88088067b3a..a1ee90b0bb5d 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/ContentElementsCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/ContentElementsCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Frontend; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Frontend; use Facebook\WebDriver\Remote\RemoteWebDriver; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -29,9 +29,9 @@ class ContentElementsCest protected string $sidebar = '.sidebar.list-group'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('Page'); @@ -48,9 +48,9 @@ class ContentElementsCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeAllContentElements(BackendTester $I): void + public function seeAllContentElements(ApplicationTester $I): void { $I->see('styleguide frontend demo'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/FormFrameworkCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/FormFrameworkCest.php similarity index 87% rename from typo3/sysext/core/Tests/Acceptance/Backend/Frontend/FormFrameworkCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Frontend/FormFrameworkCest.php index 5b8af7e7d6b7..e40bfd48824d 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/FormFrameworkCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/FormFrameworkCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Frontend; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Frontend; use Facebook\WebDriver\Remote\RemoteWebDriver; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class FormFrameworkCest @@ -32,9 +32,9 @@ class FormFrameworkCest protected string $summaryValueSelector = '[id^=simpleform] table td:not(.summary-table-first-col)'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('Page'); @@ -53,9 +53,9 @@ class FormFrameworkCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function sentInvalidForm(BackendTester $I): void + public function sentInvalidForm(ApplicationTester $I): void { $mandatory = 'This field is mandatory.'; $mandatoryEmail = 'You must enter a valid email address.'; @@ -69,9 +69,9 @@ class FormFrameworkCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function sentValidForm(BackendTester $I): void + public function sentValidForm(ApplicationTester $I): void { $name = 'Jane Doe'; $subject = 'Welcome to TYPO3'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/FrontendLoginCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/FrontendLoginCest.php similarity index 85% rename from typo3/sysext/core/Tests/Acceptance/Backend/Frontend/FrontendLoginCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Frontend/FrontendLoginCest.php index 18481d52b852..d77ee1e5628e 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/FrontendLoginCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/FrontendLoginCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Frontend; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Frontend; use Facebook\WebDriver\Remote\RemoteWebDriver; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class FrontendLoginCest @@ -30,9 +30,9 @@ class FrontendLoginCest protected string $frameSelector = '.frame-type-felogin_login'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('Page'); @@ -51,9 +51,9 @@ class FrontendLoginCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeLoginFailed(BackendTester $I): void + public function seeLoginFailed(ApplicationTester $I): void { $I->fillField($this->usernameSelector, 'username'); $I->fillField($this->passwordSelector, 'wrong password'); @@ -62,9 +62,9 @@ class FrontendLoginCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeLoginSuccessAndLogout(BackendTester $I): void + public function seeLoginSuccessAndLogout(ApplicationTester $I): void { $I->fillField($this->usernameSelector, 'styleguide-frontend-demo'); $I->fillField($this->passwordSelector, 'password'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/IndexedSearchCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/IndexedSearchCest.php similarity index 87% rename from typo3/sysext/core/Tests/Acceptance/Backend/Frontend/IndexedSearchCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Frontend/IndexedSearchCest.php index 8e15c3c39660..3fa91eb98704 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Frontend/IndexedSearchCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Frontend/IndexedSearchCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Frontend; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Frontend; use Facebook\WebDriver\Remote\RemoteWebDriver; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class IndexedSearchCest @@ -31,9 +31,9 @@ class IndexedSearchCest protected string $submitSelector = '.tx-indexedsearch-search-submit input[type=submit]'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('Page'); @@ -52,9 +52,9 @@ class IndexedSearchCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeSearchResults(BackendTester $I): void + public function seeSearchResults(ApplicationTester $I): void { $I->fillField($this->searchSelector, 'search word'); $I->click($this->submitSelector); @@ -62,9 +62,9 @@ class IndexedSearchCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeAdvancedSearch(BackendTester $I): void + public function seeAdvancedSearch(ApplicationTester $I): void { $seeElements = [ '#tx-indexedsearch-selectbox-searchtype', diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php b/typo3/sysext/core/Tests/Acceptance/Application/General/ModuleMenuCest.php similarity index 82% rename from typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/General/ModuleMenuCest.php index 59d42d90935c..10f50549ef90 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/General/ModuleMenuCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\General; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\General; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Module Menu tests @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class ModuleMenuCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkIfModuleMenuIsCollapsible(BackendTester $I) + public function checkIfModuleMenuIsCollapsible(ApplicationTester $I) { // A sub-element of web module is shown $I->waitForElementVisible('#web + .modulemenu-group-container .modulemenu-action'); @@ -56,9 +56,9 @@ class ModuleMenuCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function selectingAModuleDoesHighlightIt(BackendTester $I) + public function selectingAModuleDoesHighlightIt(ApplicationTester $I) { $I->seeNumberOfElements('#web + .modulemenu-group-container .modulemenu-action', [2, 20]); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/AbstractCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php similarity index 87% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/AbstractCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php index d4e11db95dc3..ddd93d44e380 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/AbstractCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Impexp; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Impexp; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -29,7 +29,7 @@ abstract class AbstractCest protected string $contextMenuExport = '[data-callback-action=exportT3d]'; protected string $contextMenuImport = '[data-callback-action=importT3d]'; - protected function selectInContextMenu(BackendTester $I, array $path): void + protected function selectInContextMenu(ApplicationTester $I, array $path): void { foreach ($path as $depth => $selector) { $contextMenuId = sprintf('#contentMenu%d', $depth); @@ -38,14 +38,14 @@ abstract class AbstractCest } } - protected function waitForAjaxRequestToFinish(BackendTester $I): void + protected function waitForAjaxRequestToFinish(ApplicationTester $I): void { $I->waitForJS('return $.active == 0;', 10); // sometimes rendering is still slower that ajax being finished. $I->wait(0.5); } - protected function setPageAccess(BackendTester $I, PageTree $pageTree, array $pagePath, int $userGroupId, int $recursionLevel = 1): void + protected function setPageAccess(ApplicationTester $I, PageTree $pageTree, array $pagePath, int $userGroupId, int $recursionLevel = 1): void { $I->switchToMainFrame(); $I->click('Access'); @@ -61,7 +61,7 @@ abstract class AbstractCest $I->click($this->inModuleHeader . ' .btn[title="Save and close"]'); } - protected function setModAccess(BackendTester $I, int $userGroupId, array $modAccessByName): void + protected function setModAccess(ApplicationTester $I, int $userGroupId, array $modAccessByName): void { try { $I->seeElement($this->inModuleHeader . ' [name=BackendUserModuleMenu]'); @@ -92,7 +92,7 @@ abstract class AbstractCest $I->waitForText('Backend User Group Listing'); } - protected function setUserTsConfig(BackendTester $I, int $userId, string $userTsConfig): void + protected function setUserTsConfig(ApplicationTester $I, int $userId, string $userTsConfig): void { try { $I->seeElement($this->inModuleHeader . ' [name=BackendUserModuleMenu]'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/ExportCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php similarity index 93% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/ExportCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php index 236ec263e1c3..39b2efe7fdaa 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/ExportCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Impexp; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Impexp; use TYPO3\CMS\Core\Core\Environment; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -44,11 +44,11 @@ class ExportCest extends AbstractCest protected $inFlashMessages = '.typo3-messages'; /** - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -58,9 +58,9 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _after(BackendTester $I) + public function _after(ApplicationTester $I) { $I->amGoingTo('clean up created files'); @@ -72,11 +72,11 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function exportPageAndRecordsDisplaysTitleOfSelectedPageInModuleHeader(BackendTester $I): void + public function exportPageAndRecordsDisplaysTitleOfSelectedPageInModuleHeader(ApplicationTester $I): void { $selectedPageTitle = 'elements t3editor'; $selectedPageIcon = '//*[text()=\'' . $selectedPageTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; @@ -95,11 +95,11 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function exportTableDisplaysTitleOfRootPageInModuleHeader(BackendTester $I, PageTree $pageTree): void + public function exportTableDisplaysTitleOfRootPageInModuleHeader(ApplicationTester $I, PageTree $pageTree): void { $rootPageTitle = 'New TYPO3 site'; $tablePageTitle = 'elements t3editor'; @@ -128,11 +128,11 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function exportRecordDisplaysTitleOfRootPageInModuleHeader(BackendTester $I, PageTree $pageTree): void + public function exportRecordDisplaysTitleOfRootPageInModuleHeader(ApplicationTester $I, PageTree $pageTree): void { $rootPageTitle = 'New TYPO3 site'; $recordPageTitle = 'elements t3editor'; @@ -157,7 +157,7 @@ class ExportCest extends AbstractCest $I->dontSee($recordPageTitle, $this->inModuleHeader); } - public function saveAndDeletePresetSucceeds(BackendTester $I, ModalDialog $modalDialog): void + public function saveAndDeletePresetSucceeds(ApplicationTester $I, ModalDialog $modalDialog): void { $pageTitle = 'staticdata'; $exportPageTitle = 'Export pagetree configuration'; @@ -209,11 +209,11 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function exportPageAndRecordsFromPageTree(BackendTester $I) + public function exportPageAndRecordsFromPageTree(ApplicationTester $I) { $I->wantToTest('exporting a page with records.'); @@ -248,11 +248,11 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function exportTable(BackendTester $I) + public function exportTable(ApplicationTester $I) { $I->wantToTest('exporting a table of records.'); @@ -295,11 +295,11 @@ class ExportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function exportRecord(BackendTester $I) + public function exportRecord(ApplicationTester $I) { $I->wantToTest('exporting a single record.'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/404_page_and_records.xml b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/404_page_and_records.xml similarity index 100% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/404_page_and_records.xml rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/404_page_and_records.xml diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/sys_category_record.xml b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/sys_category_record.xml similarity index 100% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/sys_category_record.xml rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/sys_category_record.xml diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/sys_category_table.xml b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/sys_category_table.xml similarity index 100% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/sys_category_table.xml rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/sys_category_table.xml diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml similarity index 100% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/unsupported.json b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/unsupported.json similarity index 100% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/Fixtures/unsupported.json rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/Fixtures/unsupported.json diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/ImportCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ImportCest.php similarity index 89% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/ImportCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/ImportCest.php index 46ec239eed7c..b0de2eadc45e 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/ImportCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ImportCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Impexp; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Impexp; use TYPO3\CMS\Core\Core\Environment; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -52,11 +52,11 @@ class ImportCest extends AbstractCest protected $buttonNewImport = 'input[name="tx_impexp[new_import]"]'; /** - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -66,9 +66,9 @@ class ImportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _after(BackendTester $I) + public function _after(ApplicationTester $I) { $I->amGoingTo('clean up created files'); @@ -80,11 +80,11 @@ class ImportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function importDisplaysTitleOfSelectedPageInModuleHeader(BackendTester $I): void + public function importDisplaysTitleOfSelectedPageInModuleHeader(ApplicationTester $I): void { $pageInPageTreeTitle = 'elements t3editor'; $pageInPageTreeIcon = '//*[text()=\'' . $pageInPageTreeTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; @@ -99,11 +99,11 @@ class ImportCest extends AbstractCest $I->see($pageInPageTreeTitle, $this->inModuleHeader); } - public function uploadFileConsidersOverwritingFlag(BackendTester $I): void + public function uploadFileConsidersOverwritingFlag(ApplicationTester $I): void { $page1Title = 'styleguide TCA demo'; $page1Icon = '//*[text()=\'' . $page1Title . '\']/../*[contains(@class, \'node-icon-container\')]'; - $fixtureFilePath = 'Acceptance/Backend/Impexp/Fixtures/404_page_and_records.xml'; + $fixtureFilePath = 'Acceptance/Application/Impexp/Fixtures/404_page_and_records.xml'; $I->click($page1Icon); $this->selectInContextMenu($I, [$this->contextMenuMore, $this->contextMenuImport]); @@ -146,15 +146,15 @@ class ImportCest extends AbstractCest * Skip this test by declaring it private instead of using skip annotation or $I->markTestSkipped() * as it seems to break the preceding test. * - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - private function rejectUploadedFileOfUnsupportedFileFormat(BackendTester $I): void + private function rejectUploadedFileOfUnsupportedFileFormat(ApplicationTester $I): void { $page1Title = 'styleguide TCA demo'; $page1Icon = '//*[text()=\'' . $page1Title . '\']/../*[contains(@class, \'node-icon-container\')]'; - $fixtureFilePath = 'Acceptance/Backend/Impexp/Fixtures/unsupported.json'; + $fixtureFilePath = 'Acceptance/Application/Impexp/Fixtures/unsupported.json'; $I->click($page1Icon); $this->selectInContextMenu($I, [$this->contextMenuMore, $this->contextMenuImport]); @@ -171,20 +171,20 @@ class ImportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @param PageTree $pageTree * * @throws \Exception */ - public function rejectImportIfPrerequisitesNotMet(BackendTester $I, ModalDialog $modalDialog, PageTree $pageTree) + public function rejectImportIfPrerequisitesNotMet(ApplicationTester $I, ModalDialog $modalDialog, PageTree $pageTree) { $I->wantToTest('rejecting import if prerequisites not met.'); $sysCategoryTable = '#recordlist-sys_category'; $page1Title = 'styleguide TCA demo'; $page1Icon = '//*[text()=\'' . $page1Title . '\']/../*[contains(@class, \'node-icon-container\')]'; - $fixtureFilePath = 'Acceptance/Backend/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml'; + $fixtureFilePath = 'Acceptance/Application/Impexp/Fixtures/sys_category_table_with_bootstrap_package.xml'; $I->switchToContentFrame(); $I->waitForText($page1Title); @@ -224,18 +224,18 @@ class ImportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * * @throws \Exception */ - public function importPageAndRecords(BackendTester $I, ModalDialog $modalDialog) + public function importPageAndRecords(ApplicationTester $I, ModalDialog $modalDialog) { $I->wantToTest('importing a page with records.'); $page1Title = 'styleguide TCA demo'; $page1Icon = '//*[text()=\'' . $page1Title . '\']/../*[contains(@class, \'node-icon-container\')]'; - $fixtureFilePath = 'Acceptance/Backend/Impexp/Fixtures/404_page_and_records.xml'; + $fixtureFilePath = 'Acceptance/Application/Impexp/Fixtures/404_page_and_records.xml'; $I->click($page1Icon); $this->selectInContextMenu($I, [$this->contextMenuMore, $this->contextMenuImport]); @@ -266,20 +266,20 @@ class ImportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @param PageTree $pageTree * * @throws \Exception */ - public function importTable(BackendTester $I, ModalDialog $modalDialog, PageTree $pageTree) + public function importTable(ApplicationTester $I, ModalDialog $modalDialog, PageTree $pageTree) { $I->wantToTest('importing a table of records.'); $sysCategoryTable = '#recordlist-sys_category'; $page1Title = 'styleguide TCA demo'; $page1Icon = '//*[text()=\'' . $page1Title . '\']/../*[contains(@class, \'node-icon-container\')]'; - $fixtureFilePath = 'Acceptance/Backend/Impexp/Fixtures/sys_category_table.xml'; + $fixtureFilePath = 'Acceptance/Application/Impexp/Fixtures/sys_category_table.xml'; $I->switchToContentFrame(); $I->waitForText($page1Title); @@ -318,20 +318,20 @@ class ImportCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @param PageTree $pageTree * * @throws \Exception */ - public function importRecord(BackendTester $I, ModalDialog $modalDialog, PageTree $pageTree) + public function importRecord(ApplicationTester $I, ModalDialog $modalDialog, PageTree $pageTree) { $I->wantToTest('importing a single record.'); $sysCategoryTable = '#recordlist-sys_category'; $page1Title = 'styleguide TCA demo'; $page1Icon = '//*[text()=\'' . $page1Title . '\']/../*[contains(@class, \'node-icon-container\')]'; - $fixtureFilePath = 'Acceptance/Backend/Impexp/Fixtures/sys_category_record.xml'; + $fixtureFilePath = 'Acceptance/Application/Impexp/Fixtures/sys_category_record.xml'; $I->switchToContentFrame(); $I->waitForText($page1Title); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/UsersCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php similarity index 90% rename from typo3/sysext/core/Tests/Acceptance/Backend/Impexp/UsersCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php index 2cbaac099716..407e206c1f71 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Impexp/UsersCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Impexp; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Impexp; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -37,10 +37,10 @@ class UsersCest extends AbstractCest protected $checkboxForceAllUids = 'input#checkForce_all_UIDS'; /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); $I->click('List'); @@ -48,11 +48,11 @@ class UsersCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function doNotShowImportInContextMenuForNonAdminUser(BackendTester $I, PageTree $pageTree): void + public function doNotShowImportInContextMenuForNonAdminUser(ApplicationTester $I, PageTree $pageTree): void { $selectedPageTitle = 'Root'; $selectedPageIcon = '//*[text()=\'' . $selectedPageTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; @@ -72,11 +72,11 @@ class UsersCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function showImportInContextMenuForNonAdminUserIfFlagSet(BackendTester $I): void + public function showImportInContextMenuForNonAdminUserIfFlagSet(ApplicationTester $I): void { $selectedPageTitle = 'Root'; $selectedPageIcon = '//*[text()=\'' . $selectedPageTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; @@ -94,11 +94,11 @@ class UsersCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function hideImportCheckboxForceAllUidsForNonAdmin(BackendTester $I): void + public function hideImportCheckboxForceAllUidsForNonAdmin(ApplicationTester $I): void { $selectedPageTitle = 'Root'; $selectedPageIcon = '//*[text()=\'' . $selectedPageTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; @@ -121,11 +121,11 @@ class UsersCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function hideUploadTabAndImportPathIfNoImportFolderAvailable(BackendTester $I, PageTree $pageTree): void + public function hideUploadTabAndImportPathIfNoImportFolderAvailable(ApplicationTester $I, PageTree $pageTree): void { $selectedPageTitle = 'Root'; $selectedPageIcon = '//*[text()=\'' . $selectedPageTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; @@ -154,11 +154,11 @@ class UsersCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function checkVisualElements(BackendTester $I, PageTree $pageTree): void + public function checkVisualElements(ApplicationTester $I, PageTree $pageTree): void { $selectedPageTitle = 'Root'; $selectedPageIcon = '//*[text()=\'' . $selectedPageTitle . '\']/../*[contains(@class, \'node-icon-container\')]'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/IndexedSearch/IndexedSearchModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/IndexedSearch/IndexedSearchModuleCest.php similarity index 86% rename from typo3/sysext/core/Tests/Acceptance/Backend/IndexedSearch/IndexedSearchModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/IndexedSearch/IndexedSearchModuleCest.php index ac4386a64801..40c618852b55 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/IndexedSearch/IndexedSearchModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/IndexedSearch/IndexedSearchModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\IndexedSearch; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\IndexedSearch; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests for the Indexed Search module @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class IndexedSearchModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkExpectedTextOnIndexedSearchPages(BackendTester $I) + public function checkExpectedTextOnIndexedSearchPages(ApplicationTester $I) { $I->click('#web_IndexedSearchIsearch'); $I->waitForElement('svg .nodes .node'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Info/InfoModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Info/InfoModuleCest.php similarity index 73% rename from typo3/sysext/core/Tests/Acceptance/Backend/Info/InfoModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Info/InfoModuleCest.php index dc16dff88567..b27b08680ca2 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Info/InfoModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Info/InfoModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Info; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Info; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -26,10 +26,10 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class InfoModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('#web_info'); @@ -39,9 +39,9 @@ class InfoModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seePageTreeOverview(BackendTester $I) + public function seePageTreeOverview(ApplicationTester $I) { $I->amGoingTo('select Pagetree Overview in dropdown'); $I->selectOption('.t3-js-jumpMenuBox', 'Pagetree Overview'); @@ -49,9 +49,9 @@ class InfoModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeLocalizationOverview(BackendTester $I) + public function seeLocalizationOverview(ApplicationTester $I) { $I->amGoingTo('select Localization Overview in dropdown'); $I->selectOption('.t3-js-jumpMenuBox', 'Localization Overview'); @@ -59,9 +59,9 @@ class InfoModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seePageTsConfig(BackendTester $I) + public function seePageTsConfig(ApplicationTester $I) { $I->amGoingTo('select Page TSconfig in dropdown'); $I->selectOption('.t3-js-jumpMenuBox', 'Page TSconfig'); @@ -69,9 +69,9 @@ class InfoModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeLog(BackendTester $I) + public function seeLog(ApplicationTester $I) { $I->amGoingTo('select Log in dropdown'); $I->selectOption('.t3-js-jumpMenuBox', 'Log'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/AbstractCest.php b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/AbstractCest.php similarity index 85% rename from typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/AbstractCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/InstallTool/AbstractCest.php index f8e3a3951082..9fd986ab86cd 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/AbstractCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/AbstractCest.php @@ -15,11 +15,11 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\InstallTool; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\InstallTool; use TYPO3\CMS\Core\Core\Environment; use TYPO3\CMS\Core\Crypto\PasswordHashing\Argon2iPasswordHash; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Utility\GeneralUtility; class AbstractCest @@ -28,12 +28,12 @@ class AbstractCest public const ADDITIONAL_CONFIGURATION_FILEPATH = 'typo3conf/AdditionalConfiguration.php'; public const INSTALL_TOOL_PASSWORD = 'temporary password'; - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->amOnPage('typo3/install.php'); } - public function _after(BackendTester $I) + public function _after(ApplicationTester $I) { $I->click('Logout'); // Make sure logout has finished @@ -46,7 +46,7 @@ class AbstractCest $I->dontSeeFileFound(Environment::getProjectPath() . '/' . self::ADDITIONAL_CONFIGURATION_FILEPATH); } - protected function logIntoInstallTool(BackendTester $I) + protected function logIntoInstallTool(ApplicationTester $I) { $password = $this->setInstallToolPassword($I); @@ -59,11 +59,11 @@ class AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @return string * @throws \TYPO3\CMS\Core\Crypto\PasswordHashing\InvalidPasswordHashException */ - private function setInstallToolPassword(BackendTester $I): string + private function setInstallToolPassword(ApplicationTester $I): string { $hashMethod = GeneralUtility::makeInstance(Argon2iPasswordHash::class); $password = self::INSTALL_TOOL_PASSWORD; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/EnvironmentCest.php b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/EnvironmentCest.php similarity index 81% rename from typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/EnvironmentCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/InstallTool/EnvironmentCest.php index 315cbb22cc42..14c6b2434409 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/EnvironmentCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/EnvironmentCest.php @@ -15,13 +15,13 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\InstallTool; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\InstallTool; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; class EnvironmentCest extends AbstractCest { - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { parent::_before($I); $this->logIntoInstallTool($I); @@ -30,10 +30,10 @@ class EnvironmentCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function imageProcessingWorks(BackendTester $I) + public function imageProcessingWorks(ApplicationTester $I) { $I->click('Test Images'); $I->waitForElementVisible('.modal-dialog'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/LoginCest.php b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/LoginCest.php similarity index 94% rename from typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/LoginCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/InstallTool/LoginCest.php index 1f96ced9192c..6337f09f068c 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/LoginCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/LoginCest.php @@ -15,17 +15,17 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\InstallTool; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\InstallTool; use TYPO3\CMS\Core\Core\Environment; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; class LoginCest extends AbstractCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function installToolLogin(BackendTester $I) + public function installToolLogin(ApplicationTester $I) { $I->amGoingTo('assert the install tool is locked in the first place'); $I->waitForElementVisible('.panel-heading'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/MaintenanceCest.php b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/MaintenanceCest.php similarity index 76% rename from typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/MaintenanceCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/InstallTool/MaintenanceCest.php index e68b74ab646c..6367422c9c60 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/MaintenanceCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/MaintenanceCest.php @@ -15,13 +15,13 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\InstallTool; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\InstallTool; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; class MaintenanceCest extends AbstractCest { - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { parent::_before($I); $this->logIntoInstallTool($I); @@ -30,10 +30,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function flushCacheWorks(BackendTester $I) + public function flushCacheWorks(ApplicationTester $I) { $I->click('Flush cache'); $I->waitForElementVisible('.alert-success'); @@ -41,10 +41,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function analyzeDatabaseStructureWorks(BackendTester $I) + public function analyzeDatabaseStructureWorks(ApplicationTester $I) { $I->click('Analyze database'); $I->waitForElementVisible('.modal-dialog'); @@ -56,10 +56,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function removeTemporaryAssetsWorks(BackendTester $I) + public function removeTemporaryAssetsWorks(ApplicationTester $I) { $I->click('Scan temporary files'); $I->waitForElementVisible('.modal-dialog'); @@ -69,10 +69,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function dumpAutoloadWorks(BackendTester $I) + public function dumpAutoloadWorks(ApplicationTester $I) { $I->click('Dump autoload'); $I->waitForElementVisible('.alert-success'); @@ -80,10 +80,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function clearPersistentTablesWorks(BackendTester $I) + public function clearPersistentTablesWorks(ApplicationTester $I) { $I->click('Scan tables'); $I->waitForElementVisible('.modal-dialog'); @@ -93,10 +93,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function createAdminUserWorks(BackendTester $I) + public function createAdminUserWorks(ApplicationTester $I) { $I->click('Create Administrator'); $I->waitForElementVisible('.modal-dialog'); @@ -106,10 +106,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function resetBackendUserPreferencesWorks(BackendTester $I) + public function resetBackendUserPreferencesWorks(ApplicationTester $I) { $I->click('Reset backend user preferences'); $I->waitForElementVisible('.alert-success'); @@ -118,10 +118,10 @@ class MaintenanceCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @throws \Exception */ - public function manageLanguagePacksWorks(BackendTester $I) + public function manageLanguagePacksWorks(ApplicationTester $I) { $I->click('Manage languages'); $I->waitForElementVisible('.modal-dialog'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/SettingsCest.php b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/SettingsCest.php similarity index 89% rename from typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/SettingsCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/InstallTool/SettingsCest.php index 839d1a554188..80672f426925 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/SettingsCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/SettingsCest.php @@ -15,16 +15,16 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\InstallTool; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\InstallTool; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; class SettingsCest extends AbstractCest { public static string $alertContainerSelector = '#alert-container'; - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { parent::_before($I); $this->logIntoInstallTool($I); @@ -33,11 +33,11 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeExtensionConfiguration(BackendTester $I, ModalDialog $modalDialog) + public function seeExtensionConfiguration(ApplicationTester $I, ModalDialog $modalDialog) { $logoAltText = 'TYPO3 logo alt text'; $inputAltText = '#em-backend-loginLogoAlt'; @@ -71,11 +71,11 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeChangeInstallToolPassword(BackendTester $I, ModalDialog $modalDialog) + public function seeChangeInstallToolPassword(ApplicationTester $I, ModalDialog $modalDialog) { $expectedInitialPasswordValue = ''; @@ -98,11 +98,11 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeManageSystemMaintainers(BackendTester $I, ModalDialog $modalDialog) + public function seeManageSystemMaintainers(ApplicationTester $I, ModalDialog $modalDialog) { $button = 'Manage System Maintainers'; $modalSave = 'Save system maintainer list'; @@ -132,11 +132,11 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeConfigurationPresets(BackendTester $I, ModalDialog $modalDialog) + public function seeConfigurationPresets(ApplicationTester $I, ModalDialog $modalDialog) { $button = 'Choose Preset'; $modalButton = 'Activate preset'; @@ -172,11 +172,11 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeFeatureToggles(BackendTester $I, ModalDialog $modalDialog) + public function seeFeatureToggles(ApplicationTester $I, ModalDialog $modalDialog) { $button = 'Configure Features'; $modalButton = 'Save'; @@ -202,11 +202,11 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeConfigureInstallationWideOptions(BackendTester $I, ModalDialog $modalDialog) + public function seeConfigureInstallationWideOptions(ApplicationTester $I, ModalDialog $modalDialog) { $button = 'Configure options'; $panel = 'Backend'; @@ -239,9 +239,9 @@ class SettingsCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - private function closeModalAndHideFlashMessage(BackendTester $I) + private function closeModalAndHideFlashMessage(ApplicationTester $I) { // We need to close the flash message here to be able to close the modal $I->click('.close', self::$alertContainerSelector); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/UpgradeCest.php b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/UpgradeCest.php similarity index 84% rename from typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/UpgradeCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/InstallTool/UpgradeCest.php index ae85c82ac9b1..1d5c9165aeda 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/InstallTool/UpgradeCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/InstallTool/UpgradeCest.php @@ -15,16 +15,16 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\InstallTool; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\InstallTool; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; class UpgradeCest extends AbstractCest { public static string $alertContainerSelector = '#alert-container'; - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { parent::_before($I); $this->logIntoInstallTool($I); @@ -33,11 +33,11 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeUpgradeCore(BackendTester $I, ModalDialog $modalDialog) + public function seeUpgradeCore(ApplicationTester $I, ModalDialog $modalDialog) { $I->click('Update Core'); $modalDialog->canSeeDialog(); @@ -48,11 +48,11 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeUpgradeWizard(BackendTester $I, ModalDialog $modalDialog) + public function seeUpgradeWizard(ApplicationTester $I, ModalDialog $modalDialog) { $I->click('Run Upgrade Wizard'); $modalDialog->canSeeDialog(); @@ -67,11 +67,11 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function seeViewUpgradeDocumentation(BackendTester $I, ModalDialog $modalDialog) + public function seeViewUpgradeDocumentation(ApplicationTester $I, ModalDialog $modalDialog) { $versionPanel = '#version-1 .t3js-changelog-list > div:first-child'; @@ -106,10 +106,10 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function seeCheckTca(BackendTester $I, ModalDialog $modalDialog) + public function seeCheckTca(ApplicationTester $I, ModalDialog $modalDialog) { $I->click('Check TCA'); $modalDialog->canSeeDialog(); @@ -119,10 +119,10 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function seeCheckForBrokenExtensions(BackendTester $I, ModalDialog $modalDialog) + public function seeCheckForBrokenExtensions(ApplicationTester $I, ModalDialog $modalDialog) { $I->click('Check Extension Compatibility'); $modalDialog->canSeeDialog(); @@ -138,10 +138,10 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function seeCheckTcaMigrations(BackendTester $I, ModalDialog $modalDialog) + public function seeCheckTcaMigrations(ApplicationTester $I, ModalDialog $modalDialog) { $I->click('Check TCA Migrations'); $modalDialog->canSeeDialog(); @@ -151,10 +151,10 @@ class UpgradeCest extends AbstractCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function seeScanExtensionFiles(BackendTester $I, ModalDialog $modalDialog) + public function seeScanExtensionFiles(ApplicationTester $I, ModalDialog $modalDialog) { $buttonText = 'Rescan'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Login/BackendLoginCest.php similarity index 86% rename from typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Login/BackendLoginCest.php index 4b56d7c0d85c..51eaa0fb78d3 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Login/BackendLoginCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Login; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Login; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; /** @@ -29,9 +29,9 @@ class BackendLoginCest * Call backend login page and verify login button changes color on mouse over, * verifies page is available and CSS is properly loaded. * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function loginButtonMouseOver(BackendTester $I) + public function loginButtonMouseOver(ApplicationTester $I) { $I->wantTo('check login functions'); $I->amOnPage('/typo3/index.php'); @@ -56,9 +56,9 @@ class BackendLoginCest * Call backend login page and submit invalid login data. * Verifies login is not accepted and an error message is rendered. * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function loginDeniedWithInvalidCredentials(BackendTester $I) + public function loginDeniedWithInvalidCredentials(ApplicationTester $I) { $I->wantTo('check login functions'); $I->amOnPage('/typo3/index.php'); @@ -86,9 +86,9 @@ class BackendLoginCest /** * Login an admin user and logout again * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function loginWorksAsAdminUser(BackendTester $I) + public function loginWorksAsAdminUser(ApplicationTester $I) { $I->wantTo('login with admin'); $this->login($I, 'admin', 'password'); @@ -103,9 +103,9 @@ class BackendLoginCest /** * Login as a non-admin user, check visible modules and logout again * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function loginWorksAsEditorUser(BackendTester $I) + public function loginWorksAsEditorUser(ApplicationTester $I) { $this->login($I, 'editor', 'password'); @@ -127,13 +127,13 @@ class BackendLoginCest /** * Helper method for user login on backend login screen * - * @param BackendTester $I + * @param ApplicationTester $I * @param string $username * @param string $password */ - protected function login(BackendTester $I, string $username, string $password) + protected function login(ApplicationTester $I, string $username, string $password) { - $I->amGoingTo('Step\Backend\Login username: ' . $username); + $I->amGoingTo('Step\Application\Login username: ' . $username); $I->amOnPage('/typo3/index.php'); $I->waitForElement('#t3-username'); $I->fillField('#t3-username', $username); @@ -151,9 +151,9 @@ class BackendLoginCest /** * Logout user by clicking logout button in toolbar * - * @param BackendTester $I + * @param ApplicationTester $I */ - protected function logout(BackendTester $I) + protected function logout(ApplicationTester $I) { $I->amGoingTo('step backend login'); $I->amGoingTo('logout'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Page/AddPageInPageModuleCest.php similarity index 93% rename from typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Page/AddPageInPageModuleCest.php index 80e4a64e92ee..32057dcebbb6 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Page/AddPageInPageModuleCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Page; use PHPUnit\Framework\SkippedTestError; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Page and page tree related tests. @@ -26,9 +26,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class AddPageInPageModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } @@ -37,9 +37,9 @@ class AddPageInPageModuleCest * This test case is used to check if a page can be added with the page module. * It also tests to remove the new page with the page tree context menu. * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function addAndDeletePage(BackendTester $I) + public function addAndDeletePage(ApplicationTester $I) { // @todo: Fix in high load scenarios or throw away $this->skipUnstable(); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php similarity index 81% rename from typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php index cb1b7693d4d6..ef96bba493e5 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/PageModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Page/PageModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Page; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -27,17 +27,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class PageModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkThatPageModuleHasAHeadline(BackendTester $I) + public function checkThatPageModuleHasAHeadline(ApplicationTester $I) { // Select the root page $I->switchToMainFrame(); @@ -50,10 +50,10 @@ class PageModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function editPageTitle(BackendTester $I, PageTree $pageTree): void + public function editPageTitle(ApplicationTester $I, PageTree $pageTree): void { $currentPageTitle = 'styleguide TCA demo'; $newPageTitle = 'styleguide TCA demo page'; @@ -72,11 +72,11 @@ class PageModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $oldTitle * @param string $newTitle */ - private function renamePage(BackendTester $I, string $oldTitle, string $newTitle) + private function renamePage(ApplicationTester $I, string $oldTitle, string $newTitle) { $editLinkSelector = 'button[data-action="edit"]'; $inputFieldSelector = 'input[class*="t3js-title-edit-input"]'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php b/typo3/sysext/core/Tests/Acceptance/Application/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php similarity index 82% rename from typo3/sysext/core/Tests/Acceptance/Backend/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php index c9c6bca3b323..77e226b129fc 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/PageTree/DragAndDrop/PageCreationWithDragAndDropCest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\PageTree\DragAndDrop; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\PageTree\DragAndDrop; /* * This file is part of the TYPO3 CMS project. @@ -18,7 +18,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\PageTree\DragAndDrop; */ use Facebook\WebDriver\WebDriverKeys; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\Mouse; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -36,11 +36,11 @@ class PageCreationWithDragAndDropCest /** * Open list module of styleguide elements basic page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws \Exception */ - public function _before(BackendTester $I, PageTree $pageTree): void + public function _before(ApplicationTester $I, PageTree $pageTree): void { $this->pageTree = $pageTree; $I->useExistingSession('admin'); @@ -55,9 +55,9 @@ class PageCreationWithDragAndDropCest /** * Check drag and drop for new pages into nodes without children. * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function dragAndDropNewPageInNodeWithoutChildren(BackendTester $I): void + public function dragAndDropNewPageInNodeWithoutChildren(ApplicationTester $I): void { $I->amGoingTo('create a new page below page without child pages using drag and drop'); $this->pageTree->dragAndDropNewPage('staticdata', static::$dragNode, static::$nodeEditInput); @@ -66,10 +66,10 @@ class PageCreationWithDragAndDropCest /** * Check drag and drop for new pages into nodes with children. * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function dragAndDropNewPageInNodeWithChildren(BackendTester $I): void + public function dragAndDropNewPageInNodeWithChildren(ApplicationTester $I): void { $I->amGoingTo('create a new page below page with child pages using drag and drop'); $this->pageTree->dragAndDropNewPage('styleguide TCA demo', static::$dragNode, static::$nodeEditInput); @@ -78,11 +78,11 @@ class PageCreationWithDragAndDropCest /** * Check drag and drop for new pages and quit page creation using Escape key. * - * @param BackendTester $I + * @param ApplicationTester $I * @param Mouse $mouse * @throws \Exception */ - public function dragAndDropNewPageAndQuitPageCreation(BackendTester $I, Mouse $mouse): void + public function dragAndDropNewPageAndQuitPageCreation(ApplicationTester $I, Mouse $mouse): void { $mouse->dragAndDrop(static::$dragNode, $this->pageTree->getPageXPathByPageName('elements basic')); @@ -94,11 +94,11 @@ class PageCreationWithDragAndDropCest /** * Check drag and drop for new pages and quit page creation using empty page title. * - * @param BackendTester $I + * @param ApplicationTester $I * @param Mouse $mouse * @throws \Exception */ - public function dragAndDropNewPageAndLeavePageTitleEmpty(BackendTester $I, Mouse $mouse): void + public function dragAndDropNewPageAndLeavePageTitleEmpty(ApplicationTester $I, Mouse $mouse): void { $mouse->dragAndDrop(static::$dragNode, $this->pageTree->getPageXPathByPageName('staticdata')); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php b/typo3/sysext/core/Tests/Acceptance/Application/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php similarity index 87% rename from typo3/sysext/core/Tests/Acceptance/Backend/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php index efb1a1cbfc48..8d06e7bce4a5 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/PageTree/KeyboardAccess/SelectPagetreeWithKeyboardCest.php @@ -15,11 +15,11 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\PageTree\KeyboardAccess; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\PageTree\KeyboardAccess; use Exception; use Facebook\WebDriver\WebDriverKeys; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -30,11 +30,11 @@ class SelectPagetreeWithKeyboardCest /** * Open list module of styleguide elements basic page * - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @throws Exception */ - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -47,9 +47,9 @@ class SelectPagetreeWithKeyboardCest /** * check selecting the next key in the page tree and open it using Enter * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function focusPageWithDownKeyAndOpenItWithEnter(BackendTester $I) + public function focusPageWithDownKeyAndOpenItWithEnter(ApplicationTester $I) { $I->seeElement('#typo3-pagetree-tree [tabindex="0"]'); $I->pressKey('#typo3-pagetree-tree [tabindex="0"]', WebDriverKeys::DOWN); @@ -65,9 +65,9 @@ class SelectPagetreeWithKeyboardCest /** * check selecting the next key in the page tree and open it using Enter * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function focusPageWithDownAndUpKey(BackendTester $I) + public function focusPageWithDownAndUpKey(ApplicationTester $I) { $I->seeElement('#typo3-pagetree-tree [tabindex="0"]'); $I->pressKey('#typo3-pagetree-tree [tabindex="0"]', WebDriverKeys::DOWN); @@ -86,9 +86,9 @@ class SelectPagetreeWithKeyboardCest /** * Expand a subtree using keyboard keys * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function expandSubtreeWithRightArrow(BackendTester $I) + public function expandSubtreeWithRightArrow(ApplicationTester $I) { $I->seeElement('#typo3-pagetree-tree [tabindex="0"]'); $I->amGoingTo('use keyboard to navigate through the tree'); @@ -130,9 +130,9 @@ class SelectPagetreeWithKeyboardCest /** * Expand a subtree using keyboard keys * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function collapseSubtreeWithLeftArrow(BackendTester $I) + public function collapseSubtreeWithLeftArrow(ApplicationTester $I) { $I->seeElement('#typo3-pagetree-tree [tabindex="0"]'); $I->assertEquals( @@ -161,9 +161,9 @@ class SelectPagetreeWithKeyboardCest /** * Check if the END key is working * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function focusLastPageTreeItemWithEndKey(BackendTester $I) + public function focusLastPageTreeItemWithEndKey(ApplicationTester $I) { $I->seeElement('#typo3-pagetree-tree [tabindex="0"]'); $I->pressKey('#typo3-pagetree-tree [tabindex="0"]', WebDriverKeys::END); @@ -181,9 +181,9 @@ class SelectPagetreeWithKeyboardCest /** * Check if the Home key is working * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function focusFirstPageTreeItemWithHomeKey(BackendTester $I) + public function focusFirstPageTreeItemWithHomeKey(ApplicationTester $I) { $I->seeElement('#typo3-pagetree-tree [tabindex="0"]'); for ($times = 0; $times < 15; $times++) { diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/PageTree/PageTreeFilterCest.php b/typo3/sysext/core/Tests/Acceptance/Application/PageTree/PageTreeFilterCest.php similarity index 88% rename from typo3/sysext/core/Tests/Acceptance/Backend/PageTree/PageTreeFilterCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/PageTree/PageTreeFilterCest.php index 86703d97f488..9e65db40471f 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/PageTree/PageTreeFilterCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/PageTree/PageTreeFilterCest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\PageTree; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\PageTree; /* * This file is part of the TYPO3 CMS project. @@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\PageTree; * The TYPO3 project - inspiring people to share! */ -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -28,7 +28,7 @@ class PageTreeFilterCest protected $pageTreeReloadButton = '#typo3-pagetree #typo3-pagetree-toolbar button[data-tree-icon=actions-refresh]'; protected $inPageTree = '#typo3-pagetree-tree .nodes'; - public function _before(BackendTester $I, PageTree $pageTree) + public function _before(ApplicationTester $I, PageTree $pageTree) { $I->useExistingSession('admin'); $I->click('List'); @@ -39,11 +39,11 @@ class PageTreeFilterCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * * @throws \Exception */ - public function filterTreeForPage(BackendTester $I) + public function filterTreeForPage(ApplicationTester $I) { $I->cantSeeElement($this->filterInputFieldClearButton); @@ -76,9 +76,9 @@ class PageTreeFilterCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function clearFilterReloadsPageTreeWithoutFilterApplied(BackendTester $I) + public function clearFilterReloadsPageTreeWithoutFilterApplied(ApplicationTester $I) { $I->fillField($this->filterInputField, 'Group'); $this->waitForAjaxRequestToFinish($I); @@ -96,12 +96,12 @@ class PageTreeFilterCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * * @throws \Exception */ - public function deletingPageWithFilterAppliedRespectsFilterUponPageTreeReload(BackendTester $I, ModalDialog $modalDialog) + public function deletingPageWithFilterAppliedRespectsFilterUponPageTreeReload(ApplicationTester $I, ModalDialog $modalDialog) { $I->fillField($this->filterInputField, 'Group'); $this->waitForAjaxRequestToFinish($I); @@ -126,10 +126,10 @@ class PageTreeFilterCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ protected function clearPageTreeFilters( - BackendTester $I + ApplicationTester $I ): void { $I->click($this->filterInputFieldClearButton); $I->click($this->pageTreeReloadButton); @@ -137,9 +137,9 @@ class PageTreeFilterCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - protected function waitForAjaxRequestToFinish(BackendTester $I): void + protected function waitForAjaxRequestToFinish(ApplicationTester $I): void { $I->waitForJS('return $.active == 0;', 10); // sometimes rendering is still slower that ajax being finished. diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/RecordList/RecordDownloadCest.php b/typo3/sysext/core/Tests/Acceptance/Application/RecordList/RecordDownloadCest.php similarity index 85% rename from typo3/sysext/core/Tests/Acceptance/Backend/RecordList/RecordDownloadCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/RecordList/RecordDownloadCest.php index 7d0a435001e6..81557ad26809 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/RecordList/RecordDownloadCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/RecordList/RecordDownloadCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\RecordList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\RecordList; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -27,19 +27,19 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class RecordDownloadCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @param ModalDialog $modalDialog */ - public function recordsCanBeExported(BackendTester $I, PageTree $pageTree, ModalDialog $modalDialog): void + public function recordsCanBeExported(ApplicationTester $I, PageTree $pageTree, ModalDialog $modalDialog): void { $I->wantToTest('whether records can be downloaded in the recordlist'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/RecordList/SysNoteCest.php b/typo3/sysext/core/Tests/Acceptance/Application/RecordList/SysNoteCest.php similarity index 86% rename from typo3/sysext/core/Tests/Acceptance/Backend/RecordList/SysNoteCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/RecordList/SysNoteCest.php index fe98ee9d1c31..300ba3f659b6 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/RecordList/SysNoteCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/RecordList/SysNoteCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\RecordList; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\RecordList; use Codeception\Util\Locator; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; /** @@ -27,18 +27,18 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; class SysNoteCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function notesEntryCanBeEdited(BackendTester $I, PageTree $pageTree) + public function notesEntryCanBeEdited(ApplicationTester $I, PageTree $pageTree) { $I->wantToTest('whether sysnote entries can be edited via the Internal Notes section in List View'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Redirect/RedirectModuleCest.php similarity index 83% rename from typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Redirect/RedirectModuleCest.php index 1ff9cb49f003..2b4649032cbd 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Redirect/RedirectModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Redirect/RedirectModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Redirect; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Redirect; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests concerning Redirects Module @@ -26,9 +26,9 @@ class RedirectModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -38,9 +38,9 @@ class RedirectModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function createNewRecordIfNoneExist(BackendTester $I) + public function createNewRecordIfNoneExist(ApplicationTester $I) { $I->amGoingTo('create a new redirects record while none are in the system, yet'); $I->canSee('No redirects found!'); @@ -64,9 +64,9 @@ class RedirectModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canEditRecordFromListView(BackendTester $I) + public function canEditRecordFromListView(ApplicationTester $I) { $sourceHost = $I->grabTextFrom('table.table-striped > tbody > tr > td:nth-child(1)'); $sourcePath = $I->grabTextFrom('table.table-striped > tbody > tr > td:nth-child(2) > a'); @@ -81,10 +81,10 @@ class RedirectModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param string $name */ - private function openAndCloseTheEditForm(BackendTester $I, string $name): void + private function openAndCloseTheEditForm(ApplicationTester $I, string $name): void { $I->waitForElementNotVisible('#t3js-ui-block'); $I->canSee('Edit Redirect "' . $name . '" on root level'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Report/ReportModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Report/ReportModuleCest.php similarity index 73% rename from typo3/sysext/core/Tests/Acceptance/Backend/Report/ReportModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Report/ReportModuleCest.php index 11d0539a5f76..9e1b213648ba 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Report/ReportModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Report/ReportModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Report; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Report; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Tests concerning Reports Module @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class ReportModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -37,9 +37,9 @@ class ReportModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeStatusReport(BackendTester $I) + public function seeStatusReport(ApplicationTester $I) { $I->amGoingTo('select Reports in dropdown'); $I->selectOption('.t3-js-jumpMenuBox', 'Status Report'); @@ -47,9 +47,9 @@ class ReportModuleCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeInstalledServices(BackendTester $I) + public function seeInstalledServices(ApplicationTester $I) { $I->amGoingTo('select Installed Services in dropdown'); $I->selectOption('.t3-js-jumpMenuBox', 'Installed Services'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Scheduler/TasksCest.php similarity index 85% rename from typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Scheduler/TasksCest.php index ad25badde889..176729e09ee2 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Scheduler/TasksCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Scheduler/TasksCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Scheduler; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Scheduler; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; /** @@ -26,9 +26,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; class TasksCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); $I->scrollTo('#system_txschedulerM1'); @@ -38,9 +38,9 @@ class TasksCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function createASchedulerTask(BackendTester $I) + public function createASchedulerTask(ApplicationTester $I) { $I->see('No tasks defined yet'); $I->click('//a[contains(@title, "Add task")]', '.module-docheader'); @@ -57,9 +57,9 @@ class TasksCest /** * @depends createASchedulerTask - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canRunTask(BackendTester $I) + public function canRunTask(ApplicationTester $I) { // run the task $I->click('a[data-bs-original-title="Run task"]'); @@ -70,9 +70,9 @@ class TasksCest /** * @depends createASchedulerTask - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canEditTask(BackendTester $I) + public function canEditTask(ApplicationTester $I) { $I->click('//a[contains(@data-bs-original-title, "Edit")]'); $I->waitForText('Edit task'); @@ -86,9 +86,9 @@ class TasksCest /** * @depends canRunTask - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canEnableAndDisableTask(BackendTester $I) + public function canEnableAndDisableTask(ApplicationTester $I) { $I->wantTo('See a enable button for a task'); $I->click('//a[contains(@data-bs-original-title, "Enable")]', '#tx_scheduler_form'); @@ -107,10 +107,10 @@ class TasksCest /** * @depends createASchedulerTask - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function canDeleteTask(BackendTester $I, ModalDialog $modalDialog) + public function canDeleteTask(ApplicationTester $I, ModalDialog $modalDialog) { $I->wantTo('See a delete button for a task'); $I->seeElement('//a[contains(@data-bs-original-title, "Delete")]'); @@ -132,9 +132,9 @@ class TasksCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canSwitchToSetupCheck(BackendTester $I) + public function canSwitchToSetupCheck(ApplicationTester $I) { $I->selectOption('select[name=SchedulerJumpMenu]', 'Setup check'); $I->waitForElementVisible('div.tx_scheduler_mod1'); @@ -143,9 +143,9 @@ class TasksCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canSwitchToInformation(BackendTester $I) + public function canSwitchToInformation(ApplicationTester $I) { $I->selectOption('select[name=SchedulerJumpMenu]', 'Information'); $I->waitForElementVisible('div.tx_scheduler_mod1'); @@ -154,9 +154,9 @@ class TasksCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function canCreateNewTaskGroupFromEditForm(BackendTester $I) + public function canCreateNewTaskGroupFromEditForm(ApplicationTester $I) { $I->amGoingTo('create a task when none exists yet'); $I->canSee('Scheduled tasks', 'h1'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Site/SiteModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php similarity index 95% rename from typo3/sysext/core/Tests/Acceptance/Backend/Site/SiteModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php index a4bd95ecddbd..8fce3d5bc191 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Site/SiteModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Site/SiteModuleCest.php @@ -15,11 +15,11 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Site; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Site; use Facebook\WebDriver\Remote\RemoteWebDriver; use Facebook\WebDriver\Remote\RemoteWebElement; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; @@ -30,18 +30,18 @@ class SiteModuleCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function editExistingRecord(BackendTester $I, ModalDialog $modalDialog) + public function editExistingRecord(ApplicationTester $I, ModalDialog $modalDialog) { $acceptanceUrl = $I->grabModuleConfig('WebDriver', 'url'); $acceptanceUrlWithTrailingSlash = rtrim($acceptanceUrl, '/') . '/'; @@ -149,11 +149,11 @@ class SiteModuleCest * Add a default FE ts snipped to the existing site config and verify FE is rendered * * @depends editExistingRecord - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree * @param ModalDialog $modalDialog */ - public function defaultFrontendRendering(BackendTester $I, PageTree $pageTree, ModalDialog $modalDialog) + public function defaultFrontendRendering(ApplicationTester $I, PageTree $pageTree, ModalDialog $modalDialog) { $I->amGoingTo('Create a default FE typoscript for the created site configuration'); @@ -229,11 +229,11 @@ page.10.value = This is a default text for default rendering without dynamic con /** * @depends defaultFrontendRendering - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog * @throws \Exception */ - public function createSiteConfigIfNoneExists(BackendTester $I, ModalDialog $modalDialog) + public function createSiteConfigIfNoneExists(ApplicationTester $I, ModalDialog $modalDialog) { $acceptanceUrl = $I->grabModuleConfig('WebDriver', 'url'); $acceptanceUrlWithTrailingSlash = rtrim($acceptanceUrl, '/') . '/'; @@ -301,11 +301,11 @@ page.10.value = This is a default text for default rendering without dynamic con /** * Find input field by label name * - * @param BackendTester $I + * @param ApplicationTester $I * @param string $fieldLabel * @return RemoteWebElement */ - protected function getInputByLabel(BackendTester $I, string $labelName, string $tag = 'input[@type="text"]'): RemoteWebElement + protected function getInputByLabel(ApplicationTester $I, string $labelName, string $tag = 'input[@type="text"]'): RemoteWebElement { $I->comment('Get input for label "' . $labelName . '"'); return $I->executeInSelenium( diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Template/TemplateCest.php similarity index 93% rename from typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Template/TemplateCest.php index cf30ff6ef3e1..4c6272da2051 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Template/TemplateCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Template/TemplateCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Template; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Template; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Template tests @@ -25,9 +25,9 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class TemplateCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); @@ -40,9 +40,9 @@ class TemplateCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function pagesWithNoTemplateShouldShowButtonsToCreateTemplates(BackendTester $I) + public function pagesWithNoTemplateShouldShowButtonsToCreateTemplates(ApplicationTester $I) { $I->wantTo('show templates overview on root page (uid = 0)'); // Select the root page @@ -74,9 +74,9 @@ class TemplateCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function addANewSiteTemplate(BackendTester $I) + public function addANewSiteTemplate(ApplicationTester $I) { $I->wantTo('create a new site template'); $I->switchToMainFrame(); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/BookmarkCest.php similarity index 83% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/BookmarkCest.php index dbd263789276..c4a74cf4e098 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/BookmarkCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/BookmarkCest.php @@ -15,10 +15,10 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; use Codeception\Scenario; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; @@ -42,18 +42,18 @@ class BookmarkCest protected static $docHeaderBookmarkButtonSelector = '#dropdownShortcutMenu'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I - * @return BackendTester + * @param ApplicationTester $I + * @return ApplicationTester */ - public function checkThatBookmarkListIsInitiallyEmpty(BackendTester $I) + public function checkThatBookmarkListIsInitiallyEmpty(ApplicationTester $I) { $this->clickBookmarkDropdownToggleInTopbar($I); $I->cantSeeElement(self::$topBarModuleSelector . ' .shortcut'); @@ -62,11 +62,11 @@ class BookmarkCest /** * @depends checkThatBookmarkListIsInitiallyEmpty - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $dialog - * @return BackendTester + * @return ApplicationTester */ - public function checkThatAddingABookmarkAddsItemToTheBookmarkList(BackendTester $I, ModalDialog $dialog, Scenario $scenario) + public function checkThatAddingABookmarkAddsItemToTheBookmarkList(ApplicationTester $I, ModalDialog $dialog, Scenario $scenario) { // open the scheduler module as we would like to put it into the bookmark list $I->click('Scheduler', '.scaffold-modulemenu'); @@ -106,10 +106,10 @@ class BookmarkCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @depends checkThatAddingABookmarkAddsItemToTheBookmarkList */ - public function checkIfBookmarkItemLinksToTarget(BackendTester $I) + public function checkIfBookmarkItemLinksToTarget(ApplicationTester $I) { $this->clickBookmarkDropdownToggleInTopbar($I); $I->click('Scheduled tasks', self::$topBarModuleSelector); @@ -118,10 +118,10 @@ class BookmarkCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @depends checkThatAddingABookmarkAddsItemToTheBookmarkList */ - public function checkIfEditBookmarkItemWorks(BackendTester $I) + public function checkIfEditBookmarkItemWorks(ApplicationTester $I) { $this->clickBookmarkDropdownToggleInTopbar($I); $firstShortcutSelector = self::$topBarModuleSelector . ' .t3js-topbar-shortcut'; @@ -137,10 +137,10 @@ class BookmarkCest } /** - * @param BackendTester $I + * @param ApplicationTester $I * @depends checkThatAddingABookmarkAddsItemToTheBookmarkList */ - public function checkIfDeleteBookmarkWorks(BackendTester $I, ModalDialog $dialog) + public function checkIfDeleteBookmarkWorks(ApplicationTester $I, ModalDialog $dialog) { $this->clickBookmarkDropdownToggleInTopbar($I); @@ -152,9 +152,9 @@ class BookmarkCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - protected function clickBookmarkDropdownToggleInTopbar(BackendTester $I) + protected function clickBookmarkDropdownToggleInTopbar(ApplicationTester $I) { $I->waitForElementVisible(self::$topBarModuleSelector . ' ' . Topbar::$dropdownToggleSelector); $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/FlushCest.php similarity index 74% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/FlushCest.php index a9a45ef00389..f8af428060ff 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/FlushCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/FlushCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; /** @@ -33,18 +33,18 @@ class FlushCest protected static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-clearcachetoolbaritem'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I - * @return BackendTester + * @param ApplicationTester $I + * @return ApplicationTester */ - public function canSeeModuleInTopbar(BackendTester $I) + public function canSeeModuleInTopbar(ApplicationTester $I) { $I->canSeeElement(self::$topBarModuleSelector); return $I; @@ -52,9 +52,9 @@ class FlushCest /** * @depends canSeeModuleInTopbar - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeFlushCachesLinksInClearCacheModule(BackendTester $I) + public function seeFlushCachesLinksInClearCacheModule(ApplicationTester $I) { $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); // Ensure existence of link for flush frontend caches diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/HelpCest.php similarity index 76% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/HelpCest.php index 96cf77281e5f..6eadaa4d65bc 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/HelpCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/HelpCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; /** @@ -33,18 +33,18 @@ class HelpCest public static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-helptoolbaritem'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I - * @return BackendTester + * @param ApplicationTester $I + * @return ApplicationTester */ - public function canSeeModuleInTopbar(BackendTester $I) + public function canSeeModuleInTopbar(ApplicationTester $I) { $I->canSeeElement(self::$topBarModuleSelector); return $I; @@ -52,9 +52,9 @@ class HelpCest /** * @depends canSeeModuleInTopbar - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeStyleguideInHelpModule(BackendTester $I) + public function seeStyleguideInHelpModule(ApplicationTester $I) { $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); $I->canSee('Styleguide', self::$topBarModuleSelector); @@ -64,9 +64,9 @@ class HelpCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeAboutInHelpModule(BackendTester $I) + public function seeAboutInHelpModule(ApplicationTester $I) { $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); $I->canSee('About TYPO3 CMS', self::$topBarModuleSelector); @@ -76,9 +76,9 @@ class HelpCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeManualInHelpModule(BackendTester $I) + public function seeManualInHelpModule(ApplicationTester $I) { $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); $I->canSee('TYPO3 Manual', self::$topBarModuleSelector); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/LogoCest.php similarity index 69% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/LogoCest.php index 99cb18fa015a..950ed73d3772 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/LogoCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/LogoCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Acceptance test for the TYPO3 logo in the topbar @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class LogoCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkIfTypo3LogoIsLinked(BackendTester $I) + public function checkIfTypo3LogoIsLinked(ApplicationTester $I) { $I->seeElement('//div[@class="topbar-header-site"]/a[@href="./"]'); } diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/ModuleMenuButtonCest.php similarity index 87% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/ModuleMenuButtonCest.php index 3bc81e098f7f..16af9ba483de 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/ModuleMenuButtonCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/ModuleMenuButtonCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Acceptance test for the menu button in the topbar @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class ModuleMenuButtonCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkModelMenuButtonFromBigToSmallScreen(BackendTester $I) + public function checkModelMenuButtonFromBigToSmallScreen(ApplicationTester $I) { $I->wantTo('see the module menu button behavior when shrinking the window'); @@ -64,9 +64,9 @@ class ModuleMenuButtonCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkModelMenuButtonFromSmallToBigScreen(BackendTester $I) + public function checkModelMenuButtonFromSmallToBigScreen(ApplicationTester $I) { $I->wantTo('see the module menu button behavior when enlarging the window'); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/NavigationComponentTreeCest.php similarity index 82% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/NavigationComponentTreeCest.php index 14e05010a044..9285a08e86a7 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/NavigationComponentTreeCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/NavigationComponentTreeCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Acceptance test for the Navigation Component Tree @@ -25,17 +25,17 @@ use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; class NavigationComponentTreeCest { /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkTreeExpandsAndCollapseByPageModule(BackendTester $I) + public function checkTreeExpandsAndCollapseByPageModule(ApplicationTester $I) { $treeArea = '.scaffold-content-navigation-expanded'; $I->wantTo('check Page Module for Expands And Collapse'); @@ -55,9 +55,9 @@ class NavigationComponentTreeCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkTreeExpandsAndCollapseByFileModule(BackendTester $I) + public function checkTreeExpandsAndCollapseByFileModule(ApplicationTester $I) { $treeArea = '.scaffold-content-navigation-expanded'; diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/SearchCest.php similarity index 84% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/SearchCest.php index 801db637b917..1dd343ea4ea2 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/SearchCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; /** @@ -33,17 +33,17 @@ class SearchCest public static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-livesearchtoolbaritem'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function searchAndTestIfAutocompletionWorks(BackendTester $I) + public function searchAndTestIfAutocompletionWorks(ApplicationTester $I) { $I->cantSeeElement(self::$topBarModuleSelector . ' ' . Topbar::$dropdownListSelector); $I->fillField('#live-search-box', 'adm'); @@ -58,9 +58,9 @@ class SearchCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function searchForFancyTextAndCheckEmptyResultInfo(BackendTester $I) + public function searchForFancyTextAndCheckEmptyResultInfo(ApplicationTester $I) { $I->fillField('#live-search-box', 'Kasper = Jesus # joh316'); $I->waitForElementVisible(self::$topBarModuleSelector . ' ' . Topbar::$dropdownListSelector, 100); @@ -74,9 +74,9 @@ class SearchCest } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function checkIfTheShowAllLinkPointsToTheListViewWithSearchResults(BackendTester $I) + public function checkIfTheShowAllLinkPointsToTheListViewWithSearchResults(ApplicationTester $I) { $I->fillField('#live-search-box', 'fileadmin'); $I->waitForElementVisible(self::$topBarModuleSelector . ' ' . Topbar::$dropdownListSelector); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SetupCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/SetupCest.php similarity index 74% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SetupCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/SetupCest.php index f11096a9a966..3b407fe6f372 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SetupCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/SetupCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; /** @@ -33,18 +33,18 @@ class SetupCest public static $topBarModuleSelector = '#typo3-cms-backend-backend-toolbaritems-usertoolbaritem'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I - * @return BackendTester + * @param ApplicationTester $I + * @return ApplicationTester */ - public function canSeeModuleInTopbar(BackendTester $I) + public function canSeeModuleInTopbar(ApplicationTester $I) { $I->canSeeElement(self::$topBarModuleSelector); return $I; @@ -52,9 +52,9 @@ class SetupCest /** * @depends canSeeModuleInTopbar - * @param BackendTester $I + * @param ApplicationTester $I */ - public function seeUserSettingsInUserToolbarModule(BackendTester $I) + public function seeUserSettingsInUserToolbarModule(ApplicationTester $I) { $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); $I->canSee('User Settings', self::$topBarModuleSelector); diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/UsernameOnAvatarCest.php similarity index 74% rename from typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Topbar/UsernameOnAvatarCest.php index c75645d98a96..7065938f6596 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Topbar/UsernameOnAvatarCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Topbar/UsernameOnAvatarCest.php @@ -15,16 +15,16 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Topbar; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Topbar; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Topbar username and avatar module tests. */ class UsernameOnAvatarCest { - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } @@ -32,9 +32,9 @@ class UsernameOnAvatarCest /** * This test case is used to check if username is visible in the toolbar. * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function usernameIsShown(BackendTester $I) + public function usernameIsShown(ApplicationTester $I) { $I->see('admin', '#typo3-cms-backend-backend-toolbaritems-usertoolbaritem'); } diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Workspace/WorkspaceModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php similarity index 83% rename from typo3/sysext/core/Tests/Acceptance/Backend/Workspace/WorkspaceModuleCest.php rename to typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php index a529937c0beb..694618091fa4 100644 --- a/typo3/sysext/core/Tests/Acceptance/Backend/Workspace/WorkspaceModuleCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php @@ -15,9 +15,9 @@ declare(strict_types=1); * The TYPO3 project - inspiring people to share! */ -namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Page; +namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Page; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog; use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\PageTree; use TYPO3\TestingFramework\Core\Acceptance\Helper\Topbar; @@ -29,17 +29,17 @@ class WorkspaceModuleCest public static string $newPageTitle = 'styleguide TCA demo workspace'; /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function _before(BackendTester $I) + public function _before(ApplicationTester $I) { $I->useExistingSession('admin'); } /** - * @param BackendTester $I + * @param ApplicationTester $I */ - public function switchToWorkspace(BackendTester $I) + public function switchToWorkspace(ApplicationTester $I) { $I->click(Topbar::$dropdownToggleSelector, self::$topBarModuleSelector); $I->canSee('Test Workspace', self::$topBarModuleSelector); @@ -51,10 +51,10 @@ class WorkspaceModuleCest /** * @depends switchToWorkspace - * @param BackendTester $I + * @param ApplicationTester $I * @param PageTree $pageTree */ - public function editPageTitleAndSeeChangeInWorkspaceModule(BackendTester $I, PageTree $pageTree): void + public function editPageTitleAndSeeChangeInWorkspaceModule(ApplicationTester $I, PageTree $pageTree): void { $currentPageTitle = 'styleguide TCA demo'; $newPageTitle = 'styleguide TCA demo workspace'; @@ -81,10 +81,10 @@ class WorkspaceModuleCest /** * @depends editPageTitleAndSeeChangeInWorkspaceModule - * @param BackendTester $I + * @param ApplicationTester $I * @param ModalDialog $modalDialog */ - public function chooseMassActionPublish(BackendTester $I, ModalDialog $modalDialog) + public function chooseMassActionPublish(ApplicationTester $I, ModalDialog $modalDialog) { $I->click('Workspaces'); $I->switchToContentFrame(); diff --git a/typo3/sysext/core/Tests/Acceptance/Support/BackendTester.php b/typo3/sysext/core/Tests/Acceptance/Support/ApplicationTester.php similarity index 79% rename from typo3/sysext/core/Tests/Acceptance/Support/BackendTester.php rename to typo3/sysext/core/Tests/Acceptance/Support/ApplicationTester.php index 70d824e5f39d..70509cefaabf 100644 --- a/typo3/sysext/core/Tests/Acceptance/Support/BackendTester.php +++ b/typo3/sysext/core/Tests/Acceptance/Support/ApplicationTester.php @@ -17,14 +17,14 @@ declare(strict_types=1); namespace TYPO3\CMS\Core\Tests\Acceptance\Support; -use TYPO3\CMS\Core\Tests\Acceptance\Support\_generated\BackendTesterActions; +use TYPO3\CMS\Core\Tests\Acceptance\Support\_generated\ApplicationTesterActions; use TYPO3\TestingFramework\Core\Acceptance\Step\FrameSteps; /** * Default backend admin or editor actor in the backend */ -class BackendTester extends \Codeception\Actor +class ApplicationTester extends \Codeception\Actor { - use BackendTesterActions; + use ApplicationTesterActions; use FrameSteps; } diff --git a/typo3/sysext/core/Tests/Acceptance/Support/Helper/FileTree.php b/typo3/sysext/core/Tests/Acceptance/Support/Helper/FileTree.php index 428a690ab6f9..ebf0a4b4d447 100644 --- a/typo3/sysext/core/Tests/Acceptance/Support/Helper/FileTree.php +++ b/typo3/sysext/core/Tests/Acceptance/Support/Helper/FileTree.php @@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Support\Helper; * The TYPO3 project - inspiring people to share! */ -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\AbstractPageTree; class FileTree extends AbstractPageTree @@ -31,9 +31,9 @@ class FileTree extends AbstractPageTree /** * Inject our core AcceptanceTester actor into PageTree * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function __construct(BackendTester $I) + public function __construct(ApplicationTester $I) { $this->tester = $I; } diff --git a/typo3/sysext/core/Tests/Acceptance/Support/Helper/ModalDialog.php b/typo3/sysext/core/Tests/Acceptance/Support/Helper/ModalDialog.php index db6baff905bf..79b4a0446004 100644 --- a/typo3/sysext/core/Tests/Acceptance/Support/Helper/ModalDialog.php +++ b/typo3/sysext/core/Tests/Acceptance/Support/Helper/ModalDialog.php @@ -17,7 +17,7 @@ declare(strict_types=1); namespace TYPO3\CMS\Core\Tests\Acceptance\Support\Helper; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\AbstractModalDialog; /** @@ -49,9 +49,9 @@ class ModalDialog extends AbstractModalDialog /** * Inject our core AcceptanceTester actor into ModalDialog * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function __construct(BackendTester $I) + public function __construct(ApplicationTester $I) { $this->tester = $I; } diff --git a/typo3/sysext/core/Tests/Acceptance/Support/Helper/Mouse.php b/typo3/sysext/core/Tests/Acceptance/Support/Helper/Mouse.php index 375554777528..a3311124c24b 100644 --- a/typo3/sysext/core/Tests/Acceptance/Support/Helper/Mouse.php +++ b/typo3/sysext/core/Tests/Acceptance/Support/Helper/Mouse.php @@ -26,16 +26,16 @@ use Facebook\WebDriver\Remote\RemoteWebDriver; use Facebook\WebDriver\Remote\RemoteWebElement; use Facebook\WebDriver\WebDriverBy; use Facebook\WebDriver\WebDriverMouse; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; /** * Several mouse actions for Backend usage. */ class Mouse { - protected BackendTester $tester; + protected ApplicationTester $tester; - public function __construct(BackendTester $I) + public function __construct(ApplicationTester $I) { $this->tester = $I; } diff --git a/typo3/sysext/core/Tests/Acceptance/Support/Helper/PageTree.php b/typo3/sysext/core/Tests/Acceptance/Support/Helper/PageTree.php index 81d0e16d0025..cf6e853e784e 100644 --- a/typo3/sysext/core/Tests/Acceptance/Support/Helper/PageTree.php +++ b/typo3/sysext/core/Tests/Acceptance/Support/Helper/PageTree.php @@ -18,7 +18,7 @@ declare(strict_types=1); namespace TYPO3\CMS\Core\Tests\Acceptance\Support\Helper; use Facebook\WebDriver\WebDriverKeys; -use TYPO3\CMS\Core\Tests\Acceptance\Support\BackendTester; +use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester; use TYPO3\TestingFramework\Core\Acceptance\Helper\AbstractPageTree; /** @@ -31,9 +31,9 @@ class PageTree extends AbstractPageTree /** * Inject our core AcceptanceTester actor into PageTree * - * @param BackendTester $I + * @param ApplicationTester $I */ - public function __construct(BackendTester $I, Mouse $mouse) + public function __construct(ApplicationTester $I, Mouse $mouse) { $this->tester = $I; $this->mouse = $mouse; -- GitLab