Fixed invalid use of expected_conditions.new_window_opened

... in functional_tests/test_export_modal.py

functional_tests/test_export_modal.py

@@ -93,8 +93,9 @@ class ExportTestModal(LiveServerTestCase):
         export_type_json = data_export_modal.find_element_by_xpath("//*[contains(text(), 'JSON')]")
         export_type_json.click()
         data_export_btn = data_export_modal.find_element_by_id('export-data-download-btn')
+        before_click_handles = self.browser.window_handles
         data_export_btn.click()
-        WebDriverWait(self.browser, 10).until(ec.new_window_is_opened)
+        WebDriverWait(self.browser, 10).until(ec.new_window_is_opened(before_click_handles))
         tabs = self.browser.window_handles
         self.assertEqual(2, len(tabs))
         self.browser.switch_to.window(tabs[1])
@@ -109,9 +110,10 @@ class ExportTestModal(LiveServerTestCase):
         export_instance.click()
         instance_export_modal = self.browser.find_element_by_id('instance-export-modal')
         instance_export_btn = instance_export_modal.find_element_by_id('instance-export-dl')
+        before_click_handles = self.browser.window_handles
         instance_export_btn.click()
-        WebDriverWait(self.browser, 10).until(ec.new_window_is_opened)
-        tabs = self.browser.window_handles
-        self.assertEqual(2, len(tabs))
-        self.browser.switch_to.window(tabs[1])
+        WebDriverWait(self.browser, 10).until(ec.new_window_is_opened(before_click_handles))
+        after_click_handles = self.browser.window_handles
+        self.assertEqual(2, len(after_click_handles))
+        self.browser.switch_to.window(after_click_handles[1])
         self.assertIn('B.Inf.4242 Test Module', self.browser.find_element_by_tag_name('body').text)