Skip to content

Commit e865222

Browse files
MauricioFauthMauricioFauth
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 8c7ca3a + de9a89e commit e865222

3 files changed

Lines changed: 13 additions & 18 deletions

File tree

‎tests/end-to-end/Database/EventsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function (): void {
147147
$this->dbQuery(
148148
'SELECT * FROM `' . $this->databaseName . '`.`test_table`',
149149
function (): void {
150-
self::assertTrue($this->isElementPresent('className', 'table_results'));
150+
$this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
151151
// [ ] | Edit | Copy | Delete | 1 | <number>
152152
self::assertGreaterThan(2, (int) $this->getCellByTableClass('table_results', 1, 6));
153153
},
@@ -181,7 +181,7 @@ public function testEditEvents(): void
181181
$this->dbQuery(
182182
'SELECT * FROM `' . $this->databaseName . '`.`test_table`',
183183
function (): void {
184-
self::assertTrue($this->isElementPresent('className', 'table_results'));
184+
$this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
185185
// [ ] | Edit | Copy | Delete | 4
186186
self::assertGreaterThan(3, (int) $this->getCellByTableClass('table_results', 1, 6));
187187
},

‎tests/end-to-end/Table/CreateTest.php‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,10 @@ private function tableStructureAssertions(): void
137137
$this->getCellByTableId('tablestructure', 1, 10),
138138
);
139139

140-
self::assertFalse(
141-
$this->isElementPresent(
142-
'cssSelector',
143-
'table#tablestructure tbody tr:nth-child(1) "
144-
. "ul.table-structure-actions li.primary a',
145-
),
146-
);
140+
self::assertFalse($this->isElementPresent(
141+
'cssSelector',
142+
'table#tablestructure tbody tr:nth-child(1) ul li.primary a',
143+
));
147144

148145
// make assertions for second row
149146
self::assertStringContainsString(
@@ -171,11 +168,9 @@ private function tableStructureAssertions(): void
171168
$this->getCellByTableId('tablestructure', 2, 8),
172169
);
173170

174-
self::assertFalse(
175-
$this->isElementPresent(
176-
'cssSelector',
177-
'css=ul.table-structure-actions:nth-child(2) li.primary a',
178-
),
179-
);
171+
self::assertTrue($this->isElementPresent(
172+
'cssSelector',
173+
'table#tablestructure tbody tr:nth-child(2) ul li.primary a',
174+
));
180175
}
181176
}

‎tests/end-to-end/TriggersTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ function (): void {
116116
$this->dbQuery(
117117
'SELECT * FROM `' . $this->databaseName . '`.`test_table2`;',
118118
function (): void {
119-
self::assertTrue($this->isElementPresent('className', 'table_results'));
119+
$this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
120120
// [ ] | Edit | Copy | Delete | 1 | 3
121121
self::assertEquals('3', $this->getCellByTableClass('table_results', 1, 6));
122122
},
@@ -152,7 +152,7 @@ public function testEditTriggers(): void
152152
$this->dbQuery(
153153
'SELECT * FROM `' . $this->databaseName . '`.`test_table2`;',
154154
function (): void {
155-
self::assertTrue($this->isElementPresent('className', 'table_results'));
155+
$this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
156156
// [ ] | Edit | Copy | Delete | 1 | 12
157157
self::assertEquals('12', $this->getCellByTableClass('table_results', 1, 6));
158158
},
@@ -182,7 +182,7 @@ public function testDropTrigger(): void
182182
$this->dbQuery(
183183
'SELECT * FROM `' . $this->databaseName . '`.`test_table2`;',
184184
function (): void {
185-
self::assertTrue($this->isElementPresent('className', 'table_results'));
185+
$this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20);
186186
// [ ] | Edit | Copy | Delete | 1 | 2
187187
self::assertEquals('2', $this->getCellByTableClass('table_results', 1, 6));
188188
},

0 commit comments

Comments
 (0)