[yashaka#352][yashaka#353] TEST: Refactoring of test structure after …

…review
Elena7788 · Jun 20, 2021 · 2b3e068 · 2b3e068
1 parent 4f7525f
commit 2b3e068
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 53 deletions.
diff --git a/tests/integration/element__element__lazy_search_test.py b/tests/integration/element__element__lazy_search_test.py
@@ -25,7 +25,8 @@
 def test_search_does_not_start_on_creation_for_both_parent_and_inner(
     session_browser,
 ):
-    GivenPage(session_browser.driver).opened_empty()
+    page = GivenPage(session_browser.driver)
+    page.opened_empty()
 
     non_existent_element = session_browser.element(
         '#not-existing-element'
@@ -37,59 +38,51 @@ def test_search_does_not_start_on_creation_for_both_parent_and_inner(
 def test_search_is_postponed_until_actual_action_like_questioning_displayed(
     session_browser,
 ):
-    element = session_browser.element(
-        '#will-be-existing-element'
-    ).element('.will-exist-inner')
+    element = session_browser.element('#will-be-existing-element').element(
+        '.will-exist-inner'
+    )
     page = GivenPage(session_browser.driver)
-    page.opened_empty()
-
-    page.load_body(
+    page.opened_with_body(
         '''
         <h1 id="will-be-existing-element">
             <span class="will-exist-inner">Hello</span> kitty:*
         </h1>
         '''
     )
-    answer = element().is_displayed()
 
-    assert answer is True
+    until_actual_action = element().is_displayed()
+
+    assert until_actual_action is True
 
 
 def test_search_is_updated_on_next_actual_action_like_questioning_displayed(
     session_browser,
 ):
-    element = session_browser.element(
-        '#will-be-existing-element'
-    ).element('.will-exist-inner')
+    element = session_browser.element('#will-be-existing-element').element(
+        '.will-exist-inner'
+    )
     page = GivenPage(session_browser.driver)
-
     page.opened_with_body(
         '''
         <h1 id="will-be-existing-element">
             <span class="will-exist-inner">Hello</span> kitty:*
         </h1>
         '''
     )
-
-    assert element().is_displayed() is True
-
     page.load_body(
         '''
         <h1 id="will-be-existing-element">
-            <span class="will-exist-inner" style="display:none">
-              Hello
-            </span> kitty:*
+            <span class="will-exist-inner" style="display:none">Hello</span> kitty:*
         </h1>
         '''
     )
-    new_answer = element().is_displayed()
 
-    assert new_answer is False
+    updated_actual_action = element().is_displayed()
 
+    assert updated_actual_action is False
 
-def test_search_finds_exactly_inside_parent(
-    session_browser,
-):
+
+def test_search_finds_exactly_inside_parent(session_browser):
     page = GivenPage(session_browser.driver)
     page.opened_with_body(
         '''
@@ -98,7 +91,7 @@ def test_search_finds_exactly_inside_parent(
             <a href="#second">go to Heading 2</a>
             <h1 id="first">Heading 1</h1>
             <h2 id="second">Heading 2</h2>
-        /p>
+        </p>
         '''
     )
 

diff --git a/tests/integration/element__lazy_search_test.py b/tests/integration/element__lazy_search_test.py
@@ -23,14 +23,11 @@
 from tests.integration.helpers.givenpage import GivenPage
 
 
-def test_search_does_not_start_on_creation(
-    session_browser,
-):
+def test_search_does_not_start_on_creation(session_browser):
     page = GivenPage(session_browser.driver)
     page.opened_empty()
 
-    non_existent_element = session_browser.element(
-        '#not-existing-element-id')
+    non_existent_element = session_browser.element('#not-existing-element-id')
 
     assert str(non_existent_element)
 
@@ -40,41 +37,35 @@ def test_search_is_postponed_until_actual_action_like_questioning_displayed(
 ):
     page = GivenPage(session_browser.driver)
     page.opened_empty()
-
-    element = session_browser.element(
-        '#will-be-existing-element-id')
+    element = session_browser.element('#will-be-existing-element-id')
     page.load_body(
-        '''
-        <h1 id="will-be-existing-element-id">Hello kitty:*
-        </h1>
-        '''
+        '<h1 id="will-be-existing-element-id">'
+        'Hello kitty:*'
+        '</h1>'
     )
 
-    assert element().is_displayed() is True
+    until_actual_action = element().is_displayed()
+
+    assert until_actual_action is True
 
 
 def test_search_is_updated_on_next_actual_action_like_questioning_displayed(
     session_browser,
 ):
     page = GivenPage(session_browser.driver)
     page.opened_empty()
-
-    element = session_browser.element(
-        '#will-be-existing-element-id')
+    element = session_browser.element('#will-be-existing-element-id')
     page.load_body(
-        '''
-        <h1 id="will-be-existing-element-id">Hello kitty:
-        *</h1>
-        '''
+        '<h1 id="will-be-existing-element-id">'
+        'Hello kitty:*'
+        '</h1>'
     )
-
-    assert element().is_displayed() is True
-
     page.load_body(
-        '''
-        <h1 id="will-be-existing-element-id" style="display:none">Hello kitty:
-        *</h1>
-        '''
+        '<h1 id="will-be-existing-element-id" style="display:none">'
+        'Hello kitty:*'
+        '</h1>'
     )
 
-    assert element().is_displayed() is False
+    updated_actual_action = element().is_displayed()
+
+    assert updated_actual_action is False