Skip to content

Commit 1737165

Browse files
committed
[WIP] run more tests
1 parent 4ecdd6e commit 1737165

1 file changed

Lines changed: 7 additions & 20 deletions

File tree

Tests/Acceptance/Backend/WorkspaceCest.php

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -90,24 +90,20 @@ public function testWorkspaceShowsWorkspaceElements(BackendTester $I, PageTree $
9090
public function liveWorkspaceShowsLiveElementsForTranslations(BackendTester $I, PageTree $pageTree, PageTreeV13 $pageTreeV13): void
9191
{
9292
$I->clickLayoutModuleButton();
93-
if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
93+
if ($I->getTypo3MajorVersion() < 13) {
9494
$I->waitForElement('#typo3-pagetree-tree .nodes .node');
9595
$pageTree->openPath(['home', 'pageWithWorkspace']);
9696
} else {
9797
$pageTreeV13->openPath(['home', 'pageWithWorkspace']);
9898
}
9999
$I->wait(0.2);
100100
$I->switchToContentFrame();
101-
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
102-
$I->waitForElement('select[name="languageMenu"]');
103-
$I->selectOption('select[name="languageMenu"]', 'german');
104-
} else {
105-
$I->waitForText('Language');
106-
$I->click('Language');
107-
$I->waitForText('german');
108-
$I->click('german');
101+
$I->selectLanguageComparisonMode();
102+
if ($I->getTypo3MajorVersion() > 13) {
103+
$I->selectGermanInLanguageMenu();
109104
}
110105
$I->waitForElementNotVisible('#t3js-ui-block');
106+
$I->waitForText('translation-live');
111107
$I->see('translation-live');
112108
$I->dontSee('translation-ws');
113109
}
@@ -129,17 +125,8 @@ public function testWorkspaceShowsLiveElementsForTranslations(BackendTester $I,
129125
}
130126
$I->wait(0.2);
131127
$I->switchToContentFrame();
132-
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() < 12) {
133-
$I->waitForElement('select[name="languageMenu"]');
134-
$I->selectOption('select[name="languageMenu"]', 'german');
135-
} else {
136-
$I->waitForText('Language');
137-
$I->click('Language');
138-
$I->waitForText('german');
139-
$I->click('german');
140-
}
128+
$I->selectGermanInLanguageMenu();
141129
$I->waitForElementNotVisible('#t3js-ui-block');
142-
143130
$I->dontSee('translation-live');
144131
$I->see('translation-ws');
145132
$this->switchToLiveWs($I);
@@ -152,7 +139,7 @@ public function testWorkspaceShowsLiveContainerUidForContainerParentFieldWhenCon
152139
{
153140
$I->clickLayoutModuleButton();
154141
$this->switchToTestWs($I);
155-
if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
142+
if ($I->getTypo3MajorVersion() < 13) {
156143
$I->waitForElement('#typo3-pagetree-tree .nodes .node');
157144
$pageTree->openPath(['home', 'pageWithWorkspace-movedContainer']);
158145
} else {

0 commit comments

Comments
 (0)