autonomic-cooperative/civicrm-update-tester
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Compare commits

base: autonomic-cooperative:cas_typehint_fix_2021-11-03
Branches Tags
autonomic-cooperative:main autonomic-cooperative:cas_activities_20211109 autonomic-cooperative:cas_typehint_fix_2021-11-03
...
compare: autonomic-cooperative:98ec8e0e3dfda327f1a960a48cefda84309df91f
Branches Tags
autonomic-cooperative:main autonomic-cooperative:cas_activities_20211109 autonomic-cooperative:cas_typehint_fix_2021-11-03

5 Commits
cas_typehi ... 98ec8e0e3d

Author SHA1 Message Date
Cassowary Rusnov
98ec8e0e3d Merge pull request 'Fix activities selector and minor QOL changes' (#12) from cas_activities_20211109 into main 
Reviewed-on: #12
 2021-11-10 19:24:24 +01:00
Cassowary Rusnov
104eab4e90 Fix activities selector and minor QOL changes 
This changes the test_activities_tab test to select the Activities
tab by label instead of by a fixed id, in addition to providing
support for this sort of selection in the future.

Fixes: #11
 2021-11-09 10:56:03 -08:00
naomi
3bd09a9ef4 Merge branch 'main' of ssh://git.autonomic.zone:2222/autonomic-cooperative/civicrm-update-tester 2021-11-03 16:41:59 +00:00
naomi
f228527c65 --dev points to dev now 2021-11-03 16:40:35 +00:00
Cassowary Rusnov
b91c04774d Merge pull request 'Fix some type hints in civicrm_tester/base.py' (#10) from cas_typehint_fix_2021-11-03 into main 
Reviewed-on: #10
 2021-11-03 17:33:48 +01:00
2 changed files with 13 additions and 5 deletions
Expand all files Collapse all files

10
civicrm_tester/base.py
View File

@ -36,7 +36,7 @@ class BaseTester:
self.user = user
self.passwd = passwd
if dev:
self.base_url = "https://crm.staging.caat.org.uk"
self.base_url = "https://crm.dev.caat.org.uk"
else:
self.base_url = "https://crm.staging.caat.org.uk"
@ -128,6 +128,10 @@ class BaseTester:
self.logout()
self.browser.close()
def find_element(self, *args, **kwargs):
"""Alias for browser.find_element"""
return self.browser.find_element(*args, **kwargs)
def find_element_by_id(self, *args, **kwargs):
"""Alias for browser.find_element_by_id"""
return self.browser.find_element_by_id(*args, **kwargs)
@ -144,6 +148,10 @@ class BaseTester:
"""Alias for using inbuilt wait object for wait.until(EC.element_to_be_clickable)"""
return self.wait.until(EC.element_to_be_clickable(locator))
def get_tab_selector(self, tabtitle):
"""Return an XPATH string to the tab labelled `tablabel`."""
return "//li/a[@title='{label}']/..".format(label=tabtitle)
class SearchExportTester(BaseTester):
def __init__(self, *args, **kwargs):

8
civicrm_tester/test_activities_tab.py
View File

@ -14,10 +14,10 @@ class TestActivitiesTab(BaseTester):
def _test(self, cid: str):
self.debug("loading contact page for CID %s" % cid)
self.browser.get(self.contact_page.format(cid))
self.wait_until_visible((By.ID, "ui-id-10"))
self.wait_until_visible((By.XPATH, self.get_tab_selector("Activities")))
# Contact page as loaded
activities_tab_button = self.find_element_by_id("ui-id-10")
num_element = activities_tab_button.find_element_by_tag_name("em")
activities_tab_button = self.find_element(By.XPATH, self.get_tab_selector("Activities"))
num_element = activities_tab_button.find_element(By.TAG_NAME, "em")
num_of_activ = int(num_element.text)
activities_tab_button.click()
table_row_selector = (
@ -65,4 +65,4 @@ class TestActivitiesTab(BaseTester):
cid_na = "42269" # Nigel Addams
#cid_db = "43193" Use to test 100 max limit
cid_tuple = (cid_da, cid_kh, cid_na)
self._test_all(cid_tuple)
self._test_all(cid_tuple)