Skip to content

Commit c24a2ef

Browse files
Playwright fixes
1 parent 455443e commit c24a2ef

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

dyatel/dyatel_play/play_element.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,7 @@ def text(self) -> str:
398398
399399
:return: element text
400400
"""
401-
element = self._first_element
402-
return element.text_content() if element.text_content() else element.input_value()
401+
return self.inner_text
403402

404403
@property
405404
def inner_text(self) -> str:

tests/adata/pytest_utils.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ def skip_platform(item: pytest.Item, platform: str, browser: str = ''):
1919

2020
except_marker = skip_platform_marker or xfail_platform_marker
2121

22-
platform = platform if not browser else f'{platform}-{browser}'
22+
platform_with_browser = platform if not browser else f'{platform}-{browser}'
23+
args = str(getattr(except_marker, 'args', []))
2324

24-
if platform in str(getattr(except_marker, 'args', [])):
25+
if platform in args or platform_with_browser in args:
2526
kwargs = getattr(except_marker, 'kwargs', {})
2627
skip_message = f"Skip platform {platform}. Reason={kwargs.get('reason')}"
2728
item.add_marker(pytest.mark.skip(skip_message))

tests/web_tests/test_wait.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@ def test_wait_element_value(expected_condition_page):
3434
assert all((not value_without_wait, value_with_wait))
3535

3636

37-
@pytest.mark.xfail_platform('playwright', reason='Unexpected text')
38-
def test_wait_element_text(expected_condition_page, driver_wrapper):
37+
def test_wait_element_text1(expected_condition_page, driver_wrapper):
3938
btn = expected_condition_page.value_card.wait_for_text_button
4039

4140
expected_condition_page.value_card.trigger_button.click()
4241
value_without_wait = btn.text
43-
value_with_wait = btn.wait_for_text().text == 'Submit'
44-
assert all((not value_without_wait, value_with_wait))
42+
assert not value_without_wait
43+
assert btn.wait_for_text().text == 'Submit'
4544

4645

4746
def test_wait_elements_count_v1(forms_page):

0 commit comments

Comments
 (0)