fixed tests in pageslayout/ tests

Author: zenmonkeykstop

securedrop/tests/functional/source_navigation_steps.py

@@ -51,13 +51,8 @@ def _source_shows_codename(self, verify_source_name=True):
         # We use inputs to change CSS states for subsequent elements in the DOM, if it is unchecked
         # the codename is hidden
         content = self.driver.find_element_by_id("codename-show-checkbox")
-        assert content.get_attribute("checked") is None
-
-        # In the UI, the label is actually the element that is being clicked, altering the state
-        # of the input
-        self.safe_click_by_id("codename-show")
-
         assert content.get_attribute("checked") is not None
+
         content_content = self.driver.find_element_by_css_selector("#codename span")
         if verify_source_name:
             assert content_content.text == self.source_name
@@ -102,7 +97,7 @@ def _source_proceeds_to_login(self):
 
     def _source_enters_codename_in_login_form(self):
         self.safe_send_keys_by_id(
-            "codename", "ascension hypertext concert synopses"
+            "passphrase", "ascension hypertext concert synopses"
         )
 
     def _source_hits_cancel_at_submit_page(self):
@@ -160,15 +155,12 @@ def _source_submits_a_message(
         self._source_enters_text_in_message_field()
         self.safe_click_by_css_selector(".form-controls button")
 
-        def message_submitted():
+        def message_submitted(first_submission=False, verify_notification=False):
+
             if not self.accept_languages:
                 notification = self.driver.find_element_by_class_name("success")
                 assert "Thank" in notification.text
 
-                if first_submission:
-                    codename = self.driver.find_element_by_css_selector("#codename span")
-                    self.source_name = codename.text
-
                 if verify_notification:
                     first_submission_text = (
                         "Please check back later for replies." in notification.text
@@ -179,8 +171,15 @@ def message_submitted():
                     else:
                         assert not first_submission_text
 
-        self.wait_for(message_submitted)
+        self.wait_for(lambda: message_submitted(
+                                                verify_notification=verify_notification,
+                                                first_submission=first_submission
+                                                ))
 
+        # passphrase is only available on submission in first session
+        if first_submission:
+            codename = self.driver.find_element_by_css_selector("#codename span")
+            self.source_name = codename.text
         # allow time for reply key to be generated
         time.sleep(self.timeout)
 

securedrop/tests/pageslayout/test_journalist_col.py

@@ -32,7 +32,7 @@ def test_col_no_documents(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
-        self._source_submits_a_file()
+        self._source_submits_a_file(first_submission=True)
         self._source_logs_out()
         self._journalist_logs_in()
         self._journalist_visits_col()
@@ -45,7 +45,7 @@ def test_col_has_no_key(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
-        self._source_submits_a_file()
+        self._source_submits_a_file(first_submission=True)
         self._source_logs_out()
         self._journalist_logs_in()
         self._source_delete_key()
@@ -57,7 +57,7 @@ def test_col(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
-        self._source_submits_a_file()
+        self._source_submits_a_file(first_submission=True)
         self._source_logs_out()
         self._journalist_logs_in()
         self._journalist_visits_col()
@@ -68,7 +68,7 @@ def test_col_javascript(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
-        self._source_submits_a_file()
+        self._source_submits_a_file(first_submission=True)
         self._source_logs_out()
         self._journalist_logs_in()
         self._journalist_visits_col()

securedrop/tests/pageslayout/test_source.py

@@ -39,6 +39,7 @@ def test_lookup_shows_codename(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
+        self._source_submits_a_message(first_submission=True)
         self._source_shows_codename()
         self._screenshot('source-lookup-shows-codename.png')
         self._save_html('source-lookup-shows-codename.html')
@@ -88,7 +89,7 @@ def test_source_checks_for_reply(self):
         self._source_visits_source_homepage()
         self._source_chooses_to_submit_documents()
         self._source_continues_to_submit_page()
-        self._source_submits_a_file()
+        self._source_submits_a_file(first_submission=True)
         self._source_logs_out()
         self._journalist_logs_in()
         self._journalist_checks_messages()