Skip to content

Commit d2f682f

Browse files
authored
fix hope page tests cases and remove all skipped tests. (#3905)
1 parent 4dd5f0f commit d2f682f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

packages/playground/tests/frontend_selenium/pages/farm.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FarmPage:
1818
create_button = (By.XPATH, "//button[.//span[text()='Create Farm']]")
1919
farm_name_text_field = (By.XPATH, "//label[text()='Farm name']/following-sibling::input")
2020
create_farm_button = (By.XPATH, "//button[.//span[text()='Create']]")
21-
search_bar=(By.XPATH, "//label[text()='Search farm by ID or farm name']/following-sibling::input")
21+
search_bar=(By.XPATH, "//label[text()='Search farm by name']/following-sibling::input")
2222
table = (By.XPATH, "//span[text()='Farm Name']/ancestor::table")
2323
details_arrow = (By.XPATH, '//table/tbody/tr/td[5]/button')
2424
farm_Id_arrow = (By.XPATH ,'//*[@id="app"]/div[1]/div[2]/div/div[1]/div[4]/div[1]/table/thead/tr/th[2]')
@@ -88,9 +88,9 @@ def search_functionality(self, farm_name):
8888
self.browser.find_element(*self.search_bar).send_keys(Keys.DELETE)
8989
for char in farm_name:
9090
self.browser.find_element(*self.search_bar).send_keys(char)
91+
sleep(2)
9192
table = self.browser.find_element(*self.table).text
9293
tries -= 1
93-
sleep(5)
9494
if table.count('NotCertified')>1:
9595
continue
9696
if farm_name in table:
@@ -104,6 +104,9 @@ def search_functionality_invalid_name(self, farm_name):
104104
for char in farm_name:
105105
self.browser.find_element(*self.search_bar).send_keys(char)
106106
table = self.browser.find_element(*self.table).text
107+
if 'Loading items...' in table:
108+
sleep(2)
109+
table = self.browser.find_element(*self.table).text
107110
sleep(3)
108111
return table
109112

packages/playground/tests/frontend_selenium/tests/Farms/test_farm.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def before_test_setup(browser):
1717
farm_page.navigetor()
1818
return farm_page, farm_name
1919

20-
@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3676")
20+
2121
def test_create_farm(browser):
2222
"""
2323
Test Case: TC907-Create farm with valid name
@@ -133,7 +133,6 @@ def test_create_farm_invalid_name(browser):
133133
# assert id_up == sorted_up
134134

135135

136-
@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3676")
137136
def test_farmpayout_address(browser):
138137
"""
139138
Test Case: TC915 - Add farm payout address
@@ -163,12 +162,12 @@ def test_farmpayout_address(browser):
163162
cases = [' ', 'dgdd', generate_string(), 'gdhjP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6Bcfg']
164163
for case in cases:
165164
assert farm_page.add_farmpayout_address(case).is_enabled()==False
166-
case = "GCD2U5ESLGBA46ZXDVXQWBKHH7SVEW7F55GDO3MVUNHJOBM5DK5QCALQ"
165+
case = "GANNTNPQTWLSNYG6BN2DOA2KU7QZUZPRRNCWTDGC3OBKFYO2P7W5MHNT"
167166
farm_page.wait_for_button(farm_page.add_farmpayout_address(case)).click()
168167
assert farm_page.wait_for('This action will be reflected in a bit')
169168
assert farm_page.wait_for('Address Added successfully!')
170169
assert farm_page.farmpayout_address_value()[:-3] in case
171-
case = "GAK2AN6ZC4REV2GXZPTMJG2JKLRJQX746JNG7ACKNC4RSJE7ETAZSE7D"
170+
case = "GCTJ3LEETC4Q3ELEEWEMAO3ND34K4HB4WL3ZMB6VJEMIFLP5EWSLEHGQ" ## Update with different address
172171
farm_page.wait_for_button(browser.find_element(*farm_page.add_v2_button)).click()
173172
farm_page.wait_for_button(farm_page.add_farmpayout_address(case)).click()
174173
assert farm_page.wait_for('This action will be reflected in a bit')
@@ -178,7 +177,7 @@ def test_farmpayout_address(browser):
178177
assert farm_page.farmpayout_address_value()[:-3] in case
179178

180179

181-
@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3676")
180+
182181
def test_ip(browser):
183182
"""
184183
Test Case: TC1141 - Enter valid IP
@@ -237,7 +236,7 @@ def test_ip(browser):
237236
assert farm_page.wait_for('IP is deleted successfully!')
238237
assert farm_page.get_ip(ip, gateway) == (0,0)
239238

240-
@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3676")
239+
241240
def test_gateway(browser):
242241
"""
243242
Test Case: TC1142 - Enter valid Gateway
@@ -269,7 +268,6 @@ def test_gateway(browser):
269268
farm_page.close_ip()
270269

271270

272-
@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3676")
273271
def test_range_ips(browser):
274272
"""
275273
Test Case: TC1212 - Enter invalid to IP in add range of IPs
@@ -359,7 +357,6 @@ def test_range_ips(browser):
359357
assert farm_page.get_ip(gateway, 0) == (2,0)
360358

361359

362-
@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3676")
363360
def test_farm_details(browser):
364361
"""
365362
Test Case: TC914 - Farm Details
@@ -382,7 +379,7 @@ def test_farm_details(browser):
382379
farm_page.search_functionality(farm_name)
383380
assert farm_page.wait_for_farm_name(farm_name)
384381
farm_page.search_functionality("")
385-
case = "GCD2U5ESLGBA46ZXDVXQWBKHH7SVEW7F55GDO3MVUNHJOBM5DK5QCALQ"
382+
case = "GANNTNPQTWLSNYG6BN2DOA2KU7QZUZPRRNCWTDGC3OBKFYO2P7W5MHNT"
386383
farm_page.setup_farmpayout_address(farm_name)
387384
browser.find_element(*farm_page.add_v2_button).click()
388385
farm_page.wait_for_button(farm_page.add_farmpayout_address(case)).click()

0 commit comments

Comments
 (0)