Skip to content

Commit 6c6e589

Browse files
manuel-sommermtesauro
manuel-sommer
and
mtesauro
authored
Ruff: Add N812 (#12074)
* Ruff: Add N812 * Update ruff.toml Fixed typo --------- Co-authored-by: Matt Tesauro <mtesauro@gmail.com>
1 parent c67295d commit 6c6e589

13 files changed

Lines changed: 30 additions & 30 deletions

‎ruff.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ select = [
3737
"W",
3838
"C90",
3939
"I",
40-
"N803", "N804", "N811", "N814", "N817", "N818",
40+
"N803", "N804", "N811", "N812", "N814", "N817", "N818",
4141
"D2", "D3", "D402", "D403", "D405", "D406", "D407", "D408", "D409", "D410", "D411", "D412", "D413", "D414", "D416",
4242
"UP",
4343
"YTT",

‎tests/base_test_class.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from selenium.common.exceptions import NoAlertPresentException, NoSuchElementException
88
from selenium.webdriver.chrome.options import Options
99
from selenium.webdriver.common.by import By
10-
from selenium.webdriver.support import expected_conditions as EC
10+
from selenium.webdriver.support import expected_conditions
1111
from selenium.webdriver.support.ui import WebDriverWait
1212

1313
# import time
@@ -240,7 +240,7 @@ def wait_for_datatable_if_content(self, no_content_id, wrapper_id):
240240
if not self.is_element_by_id_present(no_content_id):
241241
# wait for product_wrapper div as datatables javascript modifies the DOM on page load.
242242
WebDriverWait(self.driver, 30).until(
243-
EC.presence_of_element_located((By.ID, wrapper_id)),
243+
expected_conditions.presence_of_element_located((By.ID, wrapper_id)),
244244
)
245245

246246
def is_element_by_css_selector_present(self, selector, text=None):

‎tests/close_old_findings_dedupe_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from product_test import ProductTest
1010
from selenium.common.exceptions import TimeoutException
1111
from selenium.webdriver.common.by import By
12-
from selenium.webdriver.support import expected_conditions as EC
12+
from selenium.webdriver.support import expected_conditions
1313
from selenium.webdriver.support.ui import Select, WebDriverWait
1414

1515
logger = logging.getLogger(__name__)
@@ -77,7 +77,7 @@ def test_delete_findings(self):
7777
driver.find_element(By.ID, "select_all").click()
7878
driver.find_element(By.CSS_SELECTOR, "i.fa-solid.fa-trash").click()
7979
try:
80-
WebDriverWait(driver, 1).until(EC.alert_is_present(),
80+
WebDriverWait(driver, 1).until(expected_conditions.alert_is_present(),
8181
"Timed out waiting for finding delete confirmation popup to appear.")
8282
driver.switch_to.alert.accept()
8383
except TimeoutException:

‎tests/close_old_findings_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from product_test import ProductTest
99
from selenium.common.exceptions import TimeoutException
1010
from selenium.webdriver.common.by import By
11-
from selenium.webdriver.support import expected_conditions as EC
11+
from selenium.webdriver.support import expected_conditions
1212
from selenium.webdriver.support.ui import Select, WebDriverWait
1313

1414
logger = logging.getLogger(__name__)
@@ -37,7 +37,7 @@ def test_delete_findings(self):
3737
driver.find_element(By.ID, "select_all").click()
3838
driver.find_element(By.CSS_SELECTOR, "i.fa-solid.fa-trash").click()
3939
try:
40-
WebDriverWait(driver, 1).until(EC.alert_is_present(),
40+
WebDriverWait(driver, 1).until(expected_conditions.alert_is_present(),
4141
"Timed out waiting for finding delete confirmation popup to appear.")
4242
driver.switch_to.alert.accept()
4343
except TimeoutException:

‎tests/dedupe_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from product_test import ProductTest
1010
from selenium.common.exceptions import TimeoutException
1111
from selenium.webdriver.common.by import By
12-
from selenium.webdriver.support import expected_conditions as EC
12+
from selenium.webdriver.support import expected_conditions
1313
from selenium.webdriver.support.ui import Select, WebDriverWait
1414

1515
logger = logging.getLogger(__name__)
@@ -75,7 +75,7 @@ def test_delete_findings(self):
7575
driver.find_element(By.ID, "select_all").click()
7676
driver.find_element(By.CSS_SELECTOR, "i.fa-solid.fa-trash").click()
7777
try:
78-
WebDriverWait(driver, 1).until(EC.alert_is_present(),
78+
WebDriverWait(driver, 1).until(expected_conditions.alert_is_present(),
7979
"Timed out waiting for finding delete confirmation popup to appear.")
8080
driver.switch_to.alert.accept()
8181
except TimeoutException:

‎tests/finding_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from product_test import ProductTest, WaitForPageLoad
1010
from selenium.common.exceptions import TimeoutException
1111
from selenium.webdriver.common.by import By
12-
from selenium.webdriver.support import expected_conditions as EC
12+
from selenium.webdriver.support import expected_conditions
1313
from selenium.webdriver.support.ui import Select, WebDriverWait
1414
from user_test import UserTest
1515

@@ -192,7 +192,7 @@ def test_mark_finding_for_review(self):
192192
# Let's make the first user in the list a reviewer
193193
# set select element style from 'none' to 'inline'
194194
try:
195-
WebDriverWait(driver, 5).until(EC.presence_of_element_located((By.ID, "id_reviewers")))
195+
WebDriverWait(driver, 5).until(expected_conditions.presence_of_element_located((By.ID, "id_reviewers")))
196196
except TimeoutException:
197197
self.fail("Timed out waiting for reviewer dropdown to initialize ")
198198

‎tests/group_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from base_test_class import BaseTestCase
55
from selenium.common.exceptions import NoSuchElementException, TimeoutException
66
from selenium.webdriver.common.by import By
7-
from selenium.webdriver.support import expected_conditions as EC
7+
from selenium.webdriver.support import expected_conditions
88
from selenium.webdriver.support.ui import Select, WebDriverWait
99
from user_test import UserTest
1010

@@ -71,7 +71,7 @@ def test_add_group_member(self):
7171
driver.find_element(By.ID, "addGroupMember").click()
7272
# Select the user 'propersahm'
7373
try:
74-
WebDriverWait(driver, 5).until(EC.presence_of_element_located((By.ID, "id_users")))
74+
WebDriverWait(driver, 5).until(expected_conditions.presence_of_element_located((By.ID, "id_users")))
7575
except TimeoutException:
7676
self.fail("Timed out waiting for products dropdown to initialize ")
7777
driver.execute_script("document.getElementsByName('users')[0].style.display = 'inline'")

‎tests/notifications_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from selenium.common.exceptions import NoSuchElementException
66
from selenium.webdriver import ActionChains
77
from selenium.webdriver.common.by import By
8-
from selenium.webdriver.support import expected_conditions as EC
8+
from selenium.webdriver.support import expected_conditions
99
from selenium.webdriver.support.ui import WebDriverWait
1010

1111

@@ -130,7 +130,7 @@ def test_user_mail_notifications_change(self):
130130
actions = ActionChains(driver)
131131
configuration_menu = driver.find_element(By.ID, "menu_configuration")
132132
actions.move_to_element(configuration_menu).perform()
133-
wait.until(EC.visibility_of_element_located((By.LINK_TEXT, "Notifications"))).click()
133+
wait.until(expected_conditions.visibility_of_element_located((By.LINK_TEXT, "Notifications"))).click()
134134

135135
originally_selected = {
136136
"product_added": driver.find_element(By.XPATH,

‎tests/product_group_test.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from product_test import ProductTest
77
from selenium.common.exceptions import TimeoutException
88
from selenium.webdriver.common.by import By
9-
from selenium.webdriver.support import expected_conditions as EC
9+
from selenium.webdriver.support import expected_conditions
1010
from selenium.webdriver.support.ui import Select, WebDriverWait
1111

1212

@@ -19,7 +19,7 @@ def test_group_add_product_group(self):
1919
driver.find_element(By.ID, "addProductGroup").click()
2020
# Select the product 'Research and Development'
2121
try:
22-
WebDriverWait(driver, 5).until(EC.presence_of_element_located((By.ID, "id_products")))
22+
WebDriverWait(driver, 5).until(expected_conditions.presence_of_element_located((By.ID, "id_products")))
2323
except TimeoutException:
2424
self.fail("Timed out waiting for products dropdown to initialize ")
2525
driver.execute_script("document.getElementsByName('products')[0].style.display = 'inline'")
@@ -76,7 +76,7 @@ def test_product_add_product_group(self):
7676
driver.find_element(By.ID, "addProductGroup").click()
7777
# Select the group 'Group Name'
7878
try:
79-
WebDriverWait(driver, 5).until(EC.presence_of_element_located((By.ID, "id_groups")))
79+
WebDriverWait(driver, 5).until(expected_conditions.presence_of_element_located((By.ID, "id_groups")))
8080
except TimeoutException:
8181
self.fail("Timed out waiting for groups dropdown to initialize ")
8282
driver.execute_script("document.getElementsByName('groups')[0].style.display = 'inline'")

‎tests/product_member_test.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from product_test import ProductTest
77
from selenium.common.exceptions import TimeoutException
88
from selenium.webdriver.common.by import By
9-
from selenium.webdriver.support import expected_conditions as EC
9+
from selenium.webdriver.support import expected_conditions
1010
from selenium.webdriver.support.ui import Select, WebDriverWait
1111
from user_test import UserTest
1212

@@ -30,7 +30,7 @@ def test_user_add_product_member(self):
3030
driver.find_element(By.ID, "addProductMember").click()
3131
# Select the product 'QA Test'
3232
try:
33-
WebDriverWait(driver, 5).until(EC.presence_of_element_located((By.ID, "id_products")))
33+
WebDriverWait(driver, 5).until(expected_conditions.presence_of_element_located((By.ID, "id_products")))
3434
except TimeoutException:
3535
self.fail("Timed out waiting for products dropdown to initialize ")
3636
driver.execute_script("document.getElementsByName('products')[0].style.display = 'inline'")
@@ -116,7 +116,7 @@ def test_product_add_product_member(self):
116116
driver.find_element(By.ID, "addProductMember").click()
117117
# Select the user 'propersahm'
118118
try:
119-
WebDriverWait(driver, 5).until(EC.presence_of_element_located((By.ID, "id_users")))
119+
WebDriverWait(driver, 5).until(expected_conditions.presence_of_element_located((By.ID, "id_users")))
120120
except TimeoutException:
121121
self.fail("Timed out waiting for users dropdown to initialize ")
122122
driver.execute_script("document.getElementsByName('users')[0].style.display = 'inline'")

0 commit comments

Comments
 (0)