From cd494e545fcf36b6cf4628c6bc869603253135bb Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 29 Sep 2022 14:38:14 +0000 Subject: [PATCH 1/4] firefox - chrome --- docker-compose.selenium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.selenium.yml b/docker-compose.selenium.yml index b918d72f7..9061f1a86 100644 --- a/docker-compose.selenium.yml +++ b/docker-compose.selenium.yml @@ -8,7 +8,7 @@ services: - 36475:36475 selenium: - image: selenium/standalone-firefox-debug:3.141.59 + image: selenium/standalone-chrome-debug:3.141.59 volumes: - ./src/tests/functional/test_files:/test_files/ - ./artifacts:/artifacts/:z From efc3b690cdc29f5520445775f5c23f742aed6b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Thu, 29 Sep 2022 17:00:25 +0200 Subject: [PATCH 2/4] Update utils.py --- src/tests/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/utils.py b/src/tests/utils.py index 639d6f0a6..789667218 100644 --- a/src/tests/utils.py +++ b/src/tests/utils.py @@ -88,7 +88,7 @@ def setUpClass(cls): cls.circle_dir = os.environ.get('CIRCLE_ARTIFACTS', os.path.join(os.getcwd(), "artifacts/")) # Setup console.log logging - desired_capabilities = DesiredCapabilities.FIREFOX + desired_capabilities = DesiredCapabilities.CHROME desired_capabilities['loggingPrefs'] = {'browser': 'ALL'} cls.selenium = webdriver.Remote( From 3af3f54f894be3e97bedaa28e90b926ae108f3b1 Mon Sep 17 00:00:00 2001 From: Debian Date: Mon, 3 Oct 2022 02:15:27 +0000 Subject: [PATCH 3/4] sleep 1 second before page save in create competition --- src/tests/functional/test_competitions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py index 0d293beb0..99c2e34dc 100644 --- a/src/tests/functional/test_competitions.py +++ b/src/tests/functional/test_competitions.py @@ -95,6 +95,7 @@ def test_manual_competition_creation(self): self.find('i[class="add icon"]').click() self.find('input[selenium="title"]').send_keys('Title') self.execute_script('$("textarea[ref=\'content\']")[0].EASY_MDE.value("Testing123")') + sleep(1) self.find('div[selenium="save1"]').click() sleep(1) From 4846f93e515d3427a8c7c0fe9dc5aba1e6216654 Mon Sep 17 00:00:00 2001 From: bbearce Date: Mon, 3 Oct 2022 04:32:09 +0000 Subject: [PATCH 4/4] rendered to src/static/generated/riot.js --- docker-compose.selenium.yml | 2 +- src/static/riot/competitions/detail/submission_manager.tag | 6 +++++- src/tests/utils.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.selenium.yml b/docker-compose.selenium.yml index 9061f1a86..b918d72f7 100644 --- a/docker-compose.selenium.yml +++ b/docker-compose.selenium.yml @@ -8,7 +8,7 @@ services: - 36475:36475 selenium: - image: selenium/standalone-chrome-debug:3.141.59 + image: selenium/standalone-firefox-debug:3.141.59 volumes: - ./src/tests/functional/test_files:/test_files/ - ./artifacts:/artifacts/:z diff --git a/src/static/riot/competitions/detail/submission_manager.tag b/src/static/riot/competitions/detail/submission_manager.tag index c371d85d1..3ec95f8e4 100644 --- a/src/static/riot/competitions/detail/submission_manager.tag +++ b/src/static/riot/competitions/detail/submission_manager.tag @@ -400,7 +400,11 @@ } self.submission_checked = function () { - event.stopPropagation() + if (typeof(event) === "object" ){ + // We can't stop upon page load as there is no "event" (button click). + // We can when we we check the checkboxes as that is an "event". + event.stopPropagation() + } let inputs = $(self.refs.submission_table).find('input') let checked_boxes = inputs.not(':first').filter('input:checked') let unchecked_boxes = inputs.not(':first').filter('input:not(:checked)') diff --git a/src/tests/utils.py b/src/tests/utils.py index 789667218..639d6f0a6 100644 --- a/src/tests/utils.py +++ b/src/tests/utils.py @@ -88,7 +88,7 @@ def setUpClass(cls): cls.circle_dir = os.environ.get('CIRCLE_ARTIFACTS', os.path.join(os.getcwd(), "artifacts/")) # Setup console.log logging - desired_capabilities = DesiredCapabilities.CHROME + desired_capabilities = DesiredCapabilities.FIREFOX desired_capabilities['loggingPrefs'] = {'browser': 'ALL'} cls.selenium = webdriver.Remote(