[phpMyAdmin Git] [phpmyadmin/phpmyadmin] eabdf8: Fix waiting for AJAX popup disappear in Selenium t...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eabdf845c359c7c3b9bf93ebbf5a4b77aec90ad1 https://github.com/phpmyadmin/phpmyadmin/commit/eabdf845c359c7c3b9bf93ebbf5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumChangePasswordTest.php M test/selenium/PmaSeleniumCreateDropDatabaseTest.php M test/selenium/PmaSeleniumCreateRemoveUserTest.php M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumDbProceduresTest.php M test/selenium/PmaSeleniumDbStructureTest.php M test/selenium/PmaSeleniumExportTest.php M test/selenium/PmaSeleniumImportTest.php M test/selenium/PmaSeleniumNormalizationTest.php M test/selenium/PmaSeleniumQueryByExampleTest.php M test/selenium/PmaSeleniumServerSettingsTest.php M test/selenium/PmaSeleniumSqlQueryTest.php M test/selenium/PmaSeleniumTableBrowseTest.php M test/selenium/PmaSeleniumTableCreateTest.php M test/selenium/PmaSeleniumTableInsertTest.php M test/selenium/PmaSeleniumTableOperationsTest.php M test/selenium/PmaSeleniumTableStructureTest.php M test/selenium/PmaSeleniumTrackingTest.php M test/selenium/PmaSeleniumXssTest.php M test/selenium/TestBase.php Log Message: ----------- Fix waiting for AJAX popup disappear in Selenium tests Waiting for ajax_message_num_1 works only on first AJAX request and we're doing more of them. This should remove need for many consequent sleeps as we were actually not properly waiting for element. Also it's better to wrap this logic in separate method as it is used in many places in the code. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: eae223215a217bfd3f2ce999ce3b4e50f349502b https://github.com/phpmyadmin/phpmyadmin/commit/eae223215a217bfd3f2ce999ce3… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/TestBase.php Log Message: ----------- Run Chrome tests on Windows It seems to perform way better with webdriver than OS X. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c674ab8791ceba53cd51157ea02fa179002f1498 https://github.com/phpmyadmin/phpmyadmin/commit/c674ab8791ceba53cd51157ea02… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/TestBase.php Log Message: ----------- Try getting element directly in waitForElement This can avoid 3 round trips to Selenium server in most situations, so it can help performance. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bbf84bd5f7c5af8a25b81a24a87db904f174897a https://github.com/phpmyadmin/phpmyadmin/commit/bbf84bd5f7c5af8a25b81a24a87… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumCreateRemoveUserTest.php M test/selenium/PmaSeleniumTrackingTest.php Log Message: ----------- Remove strange wait loops Those were most likely caused by wrong waiting on AJAX page load. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 037dde0e429b41bd869b551d5e87c4cdc05176db https://github.com/phpmyadmin/phpmyadmin/commit/037dde0e429b41bd869b551d5e8… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumDbProceduresTest.php M test/selenium/PmaSeleniumDbTriggersTest.php M test/selenium/PmaSeleniumSqlQueryTest.php M test/selenium/PmaSeleniumTrackingTest.php M test/selenium/TestBase.php Log Message: ----------- Share code for waiting for CodeMirror It takes some time to initialize, so we should wait for it. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c3f83158584ef499c9ad9faf077264463ae227e6 https://github.com/phpmyadmin/phpmyadmin/commit/c3f83158584ef499c9ad9faf077… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumDbProceduresTest.php M test/selenium/PmaSeleniumDbTriggersTest.php Log Message: ----------- Fixed waiting for event/procedure/trigger drop The nothing2display element is always present, sometimes it is just hidden. Wait for AJAX completion instead. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5c40939e74674c2bc2ca433a7a62eb968e685fd5 https://github.com/phpmyadmin/phpmyadmin/commit/5c40939e74674c2bc2ca433a7a6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumSqlQueryTest.php M test/selenium/PmaSeleniumTableBrowseTest.php M test/selenium/PmaSeleniumTableStructureTest.php M test/selenium/PmaSeleniumTrackingTest.php Log Message: ----------- Remove some no longer needed waits and sleeps Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2abb2db01d82314b8618d79234c482b41a5a6744 https://github.com/phpmyadmin/phpmyadmin/commit/2abb2db01d82314b8618d79234c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumImportTest.php M test/selenium/PmaSeleniumQueryByExampleTest.php M test/selenium/TestBase.php Log Message: ----------- Remove sleep after scrollToBottom, should not be necessary The javascript is executed synchronously, so there should be no delay. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 11ff884f6ab2d367b4f43f3d6597bf524896f918 https://github.com/phpmyadmin/phpmyadmin/commit/11ff884f6ab2d367b4f43f3d659… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumExportTest.php Log Message: ----------- Remove sleeps from export tests Those really should not be necessary or we should add some dynamic waits. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: fa2457cf3d0922af4f2491483baf8bdcef8182f0 https://github.com/phpmyadmin/phpmyadmin/commit/fa2457cf3d0922af4f2491483ba… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumTableBrowseTest.php Log Message: ----------- Simplify entering form values Use value() instead of click() and keys(). Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2f13f070cbc6e028cac8be39a1c5a33ded660ea7 https://github.com/phpmyadmin/phpmyadmin/commit/2f13f070cbc6e028cac8be39a1c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumExportTest.php Log Message: ----------- Ensure widgets are in the view Scroll based on actuall widgets we target, not by arbitrary values. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 580cb38562bd3769cbd37db898e859d58fffa3aa https://github.com/phpmyadmin/phpmyadmin/commit/580cb38562bd3769cbd37db898e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/TestBase.php Log Message: ----------- We need to scroll relatively as getBoundingClientRect returns offset Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3b19cbef9e61ddcc363719554a9db8efaf1ffef2 https://github.com/phpmyadmin/phpmyadmin/commit/3b19cbef9e61ddcc363719554a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumExportTest.php Log Message: ----------- Remove not needed waitForElement The page is already loaded here, so there is no reason to wait. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e9dece41a94e557a7ae1ba75d7b02980374e1031 https://github.com/phpmyadmin/phpmyadmin/commit/e9dece41a94e557a7ae1ba75d7b… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/TestBase.php Log Message: ----------- Simplify waitAjax Wait only based on javascript flag. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 877d620c871e5cc1281cdb03cfa12cfe7e7e2372 https://github.com/phpmyadmin/phpmyadmin/commit/877d620c871e5cc1281cdb03cfa… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumDbProceduresTest.php M test/selenium/PmaSeleniumDbTriggersTest.php Log Message: ----------- Add some missing AJAX waits in events/procedures/triggers Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f1326358d26a6c707bfa029930088875b77638e7 https://github.com/phpmyadmin/phpmyadmin/commit/f1326358d26a6c707bfa0299300… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumDbProceduresTest.php M test/selenium/PmaSeleniumDbTriggersTest.php M test/selenium/TestBase.php Log Message: ----------- Add separate wait for message to disappear Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 28345a5cd3906605dcbd71621698a8c3a6a5b257 https://github.com/phpmyadmin/phpmyadmin/commit/28345a5cd3906605dcbd7162169… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumQueryByExampleTest.php Log Message: ----------- Skip QBE tests early There is no need to bother with connecting to BrowserStack here. Issue #13621 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b881c4cddbb38cff12e21cb57ab090e505af2072 https://github.com/phpmyadmin/phpmyadmin/commit/b881c4cddbb38cff12e21cb57ab… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M test/selenium/PmaSeleniumChangePasswordTest.php M test/selenium/PmaSeleniumCreateDropDatabaseTest.php M test/selenium/PmaSeleniumCreateRemoveUserTest.php M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/PmaSeleniumDbProceduresTest.php M test/selenium/PmaSeleniumDbStructureTest.php M test/selenium/PmaSeleniumDbTriggersTest.php M test/selenium/PmaSeleniumExportTest.php M test/selenium/PmaSeleniumImportTest.php M test/selenium/PmaSeleniumNormalizationTest.php M test/selenium/PmaSeleniumQueryByExampleTest.php M test/selenium/PmaSeleniumServerSettingsTest.php M test/selenium/PmaSeleniumSqlQueryTest.php M test/selenium/PmaSeleniumTableBrowseTest.php M test/selenium/PmaSeleniumTableCreateTest.php M test/selenium/PmaSeleniumTableInsertTest.php M test/selenium/PmaSeleniumTableOperationsTest.php M test/selenium/PmaSeleniumTableStructureTest.php M test/selenium/PmaSeleniumTrackingTest.php M test/selenium/PmaSeleniumXssTest.php M test/selenium/TestBase.php Log Message: ----------- Merge branch 'selenium-optimize' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/12b7b1ac1045...b881c4cddbb3