From 1d29d8a928a8e01ca103f9e65375a834833539ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 26 Apr 2024 16:41:26 -0300 Subject: [PATCH 1/4] Fix Table\CreateTest E2E test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- test/selenium/Table/CreateTest.php | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/test/selenium/Table/CreateTest.php b/test/selenium/Table/CreateTest.php index 3a8259cb8f..1777f071b4 100644 --- a/test/selenium/Table/CreateTest.php +++ b/test/selenium/Table/CreateTest.php @@ -138,13 +138,10 @@ class CreateTest extends TestBase $this->getCellByTableId('tablestructure', 1, 10) ); - $this->assertFalse( - $this->isElementPresent( - 'cssSelector', - 'table#tablestructure tbody tr:nth-child(1) " - . "ul.table-structure-actions li.primary a' - ) - ); + self::assertFalse($this->isElementPresent( + 'cssSelector', + 'table#tablestructure tbody tr:nth-child(1) ul li.primary a' + )); // make assertions for second row $this->assertStringContainsString( @@ -172,11 +169,9 @@ class CreateTest extends TestBase $this->getCellByTableId('tablestructure', 2, 8) ); - $this->assertFalse( - $this->isElementPresent( - 'cssSelector', - 'css=ul.table-structure-actions:nth-child(2) li.primary a' - ) - ); + self::assertTrue($this->isElementPresent( + 'cssSelector', + 'table#tablestructure tbody tr:nth-child(2) ul li.primary a' + )); } } From 94ae6e113d085a75a05cf9adde394d87132c441e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 26 Apr 2024 17:09:55 -0300 Subject: [PATCH 2/4] Fix Database\EventsTest E2E test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- test/selenium/Database/EventsTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/selenium/Database/EventsTest.php b/test/selenium/Database/EventsTest.php index 126d3fa867..0335c74637 100644 --- a/test/selenium/Database/EventsTest.php +++ b/test/selenium/Database/EventsTest.php @@ -145,11 +145,11 @@ class EventsTest extends TestBase sleep(2); $this->dbQuery( - 'SELECT val FROM `' . $this->databaseName . '`.`test_table`', + 'SELECT * FROM `' . $this->databaseName . '`.`test_table`', function (): void { - $this->assertTrue($this->isElementPresent('className', 'table_results')); + $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20); // [ ] | Edit | Copy | Delete | 1 | - $this->assertGreaterThan(2, (int) $this->getCellByTableClass('table_results', 1, 5)); + $this->assertGreaterThan(2, (int) $this->getCellByTableClass('table_results', 1, 6)); } ); } @@ -183,11 +183,11 @@ class EventsTest extends TestBase sleep(2); $this->dbQuery( - 'SELECT val FROM `' . $this->databaseName . '`.`test_table`', + 'SELECT * FROM `' . $this->databaseName . '`.`test_table`', function (): void { - $this->assertTrue($this->isElementPresent('className', 'table_results')); + $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20); // [ ] | Edit | Copy | Delete | 4 - $this->assertGreaterThan(3, (int) $this->getCellByTableClass('table_results', 1, 5)); + $this->assertGreaterThan(3, (int) $this->getCellByTableClass('table_results', 1, 6)); } ); } From f384f9bb1c69d77c872fb594a2c43e6b39ae3146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 26 Apr 2024 19:00:36 -0300 Subject: [PATCH 3/4] Fix Database\TriggersTest E2E test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- test/selenium/Database/TriggersTest.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/selenium/Database/TriggersTest.php b/test/selenium/Database/TriggersTest.php index 5a773f2be5..479d26e352 100644 --- a/test/selenium/Database/TriggersTest.php +++ b/test/selenium/Database/TriggersTest.php @@ -117,11 +117,11 @@ class TriggersTest extends TestBase // test trigger $this->dbQuery('USE `' . $this->databaseName . '`;INSERT INTO `test_table` (val) VALUES (1);'); $this->dbQuery( - 'SELECT val FROM `' . $this->databaseName . '`.`test_table2`;', + 'SELECT * FROM `' . $this->databaseName . '`.`test_table2`;', function (): void { - $this->assertTrue($this->isElementPresent('className', 'table_results')); + $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20); // [ ] | Edit | Copy | Delete | 1 | 3 - $this->assertEquals('3', $this->getCellByTableClass('table_results', 1, 5)); + $this->assertEquals('3', $this->getCellByTableClass('table_results', 1, 6)); } ); } @@ -157,11 +157,11 @@ class TriggersTest extends TestBase // test trigger $this->dbQuery('USE `' . $this->databaseName . '`;INSERT INTO `test_table` (val) VALUES (1);'); $this->dbQuery( - 'SELECT val FROM `' . $this->databaseName . '`.`test_table2`;', + 'SELECT * FROM `' . $this->databaseName . '`.`test_table2`;', function (): void { - $this->assertTrue($this->isElementPresent('className', 'table_results')); + $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20); // [ ] | Edit | Copy | Delete | 1 | 12 - $this->assertEquals('12', $this->getCellByTableClass('table_results', 1, 5)); + $this->assertEquals('12', $this->getCellByTableClass('table_results', 1, 6)); } ); } @@ -189,11 +189,11 @@ class TriggersTest extends TestBase // test trigger $this->dbQuery('USE `' . $this->databaseName . '`;INSERT INTO `test_table` (val) VALUES (1);'); $this->dbQuery( - 'SELECT val FROM `' . $this->databaseName . '`.`test_table2`;', + 'SELECT * FROM `' . $this->databaseName . '`.`test_table2`;', function (): void { - $this->assertTrue($this->isElementPresent('className', 'table_results')); + $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20); // [ ] | Edit | Copy | Delete | 1 | 2 - $this->assertEquals('2', $this->getCellByTableClass('table_results', 1, 5)); + $this->assertEquals('2', $this->getCellByTableClass('table_results', 1, 6)); } ); From 2cb2ce70ce6b0eaa3a9f2aa178c842f47a484aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 26 Apr 2024 19:53:13 -0300 Subject: [PATCH 4/4] Fix Database\QueryByExampleTest E2E test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- test/selenium/Database/QueryByExampleTest.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/selenium/Database/QueryByExampleTest.php b/test/selenium/Database/QueryByExampleTest.php index 6aabcce0ae..8c4fc1d9e1 100644 --- a/test/selenium/Database/QueryByExampleTest.php +++ b/test/selenium/Database/QueryByExampleTest.php @@ -119,56 +119,56 @@ class QueryByExampleTest extends TestBase $submitButton->click(); $this->waitAjax(); - $this->waitForElement('cssSelector', 'table.table_results'); + $this->scrollToElement($this->waitForElement('className', 'table_results'), 0, 20); /* Assert Row 1 */ $this->assertEquals( 4, - $this->getCellByTableClass('table_results', 1, 5) + $this->getCellByTableClass('table_results', 1, 1) ); $this->assertEquals( 3, - $this->getCellByTableClass('table_results', 1, 6) + $this->getCellByTableClass('table_results', 1, 2) ); /* Assert Row 2 */ $this->assertEquals( 6, - $this->getCellByTableClass('table_results', 2, 5) + $this->getCellByTableClass('table_results', 2, 1) ); $this->assertEquals( 4, - $this->getCellByTableClass('table_results', 2, 6) + $this->getCellByTableClass('table_results', 2, 2) ); /* Assert Row 3 */ $this->assertEquals( 5, - $this->getCellByTableClass('table_results', 3, 5) + $this->getCellByTableClass('table_results', 3, 1) ); $this->assertEquals( 4, - $this->getCellByTableClass('table_results', 3, 6) + $this->getCellByTableClass('table_results', 3, 2) ); /* Assert Row 4 */ $this->assertEquals( 7, - $this->getCellByTableClass('table_results', 4, 5) + $this->getCellByTableClass('table_results', 4, 1) ); $this->assertEquals( 5, - $this->getCellByTableClass('table_results', 4, 6) + $this->getCellByTableClass('table_results', 4, 2) ); /* Assert Row 5 */ $this->assertEquals( 3, - $this->getCellByTableClass('table_results', 5, 5) + $this->getCellByTableClass('table_results', 5, 1) ); $this->assertEquals( 5, - $this->getCellByTableClass('table_results', 5, 6) + $this->getCellByTableClass('table_results', 5, 2) ); } }