Skip to content

Commit

Permalink
[deps] Upgraded selenium
Browse files Browse the repository at this point in the history
Upgraded the selenium dependency to match the recent upgrade in openwisp-controller
at commit openwisp/openwisp-controller@b05c875.
  • Loading branch information
Aryamanz29 authored May 13, 2023
1 parent de20571 commit 012b27b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
20 changes: 7 additions & 13 deletions openwisp_network_topology/tests/test_selenium.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,15 @@ def _assert_topology_graph(self):
WebDriverWait(self.web_driver, 2).until(
EC.visibility_of_element_located((By.CLASS_NAME, 'njg-aboutContainer'))
)
topology_graph_label_keys = self.web_driver.find_elements_by_css_selector(
'.njg-keyLabel'
)
topology_graph_label_values = self.web_driver.find_elements_by_css_selector(
'.njg-valueLabel'
)
console_logs = self.web_driver.get_log('browser')
console_errors = self._get_console_errors(console_logs)
self.assertEqual(console_errors, [])
topology_graph_dict = self.topology.json(dict=True)
topology_graph_label_keys = self.web_driver.find_elements_by_css_selector(
'.njg-keyLabel'
topology_graph_label_keys = self.web_driver.find_elements(
By.CSS_SELECTOR, '.njg-keyLabel'
)
topology_graph_label_values = self.web_driver.find_elements_by_css_selector(
'.njg-valueLabel'
topology_graph_label_values = self.web_driver.find_elements(
By.CSS_SELECTOR, '.njg-valueLabel'
)
self.assertEqual(len(topology_graph_label_keys), len(self._EXPECTED_KEYS))
# ensure correct topology graph labels are present
Expand All @@ -144,15 +138,15 @@ def test_topology_admin_view_graph_visualizer(self):
path = reverse(f'{self.prefix}_topology_change', args=[self.topology.pk])
self.login(username=self.admin_username, password=self.admin_password)
self.open(path)
self.web_driver.find_element_by_css_selector('input.visualizelink').click()
self.web_driver.find_element(By.CSS_SELECTOR, 'input.visualizelink').click()
self._assert_topology_graph()

def test_topology_non_admin_view_graph_visualizer(self):
path = reverse('topology_list')
self.login(username=self.admin_username, password=self.admin_password)
self.open(path)
topology_graph_element = self.web_driver.find_element_by_xpath(
"//ul[@id='menu']/li/a"
topology_graph_element = self.web_driver.find_element(
By.XPATH, "//ul[@id='menu']/li/a"
)
topology_graph_element.click()
self._assert_topology_graph()
3 changes: 1 addition & 2 deletions requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ responses~=0.16.0
pytest-asyncio~=0.14.0
pytest-django~=4.5.2
freezegun~=1.1.0
selenium~=3.141.0
urllib3~=1.26.1
selenium~=4.9.0
# Needed to test integrations
openwisp-monitoring @ https://github.com/openwisp/openwisp-monitoring/tarball/master
openwisp-controller @ https://github.com/openwisp/openwisp-controller/tarball/master
Expand Down

0 comments on commit 012b27b

Please sign in to comment.