Update test_withdraw_preprint

Author: Shtogryn

pages/preprints.py

@@ -225,7 +225,10 @@ class PreprintWithdrawPage(GuidBasePage, BasePreprintPage):
         By.CSS_SELECTOR, '[data-test-comment-input] textarea'
     )
     request_withdrawal_button = Locator(
-        By.XPATH, '//div[@class="_Footer_gyio2l"]/button[text()="Withdraw"]'
+        By.CSS_SELECTOR, '[data-test-confirm-withdraw-button]'
+    )
+    withdrawn_banner = Locator(
+        By.XPATH, "//span[normalize-space(text())='This preprint has been withdrawn.']"
     )
 
 
@@ -280,6 +283,7 @@ class PreprintDetailPage(GuidBasePage, BasePreprintPage):
     downloads_count = Locator(By.CSS_SELECTOR, '[data-test-download-count]')
     download_button = Locator(By.CSS_SELECTOR, '[data-test-download-button]')
     edit_preprint_button = Locator(By.CSS_SELECTOR, '[data-test-edit-preprint-button]')
+    withdraw_preprint_button = Locator(By.CSS_SELECTOR, '[data-test-withdrawal-button]')
     default_citation = Locator(By.CSS_SELECTOR, '[data-test-default-citation="apa"]')
 
     # Locators for the reviews app preprint detail page
@@ -303,13 +307,15 @@ class PreprintDetailPage(GuidBasePage, BasePreprintPage):
 class PendingPreprintDetailPage(PreprintDetailPage):
     # This class is for preprints that are pending moderation
     identity = Locator(
-        By.ID,
-        'preprintTitle',
+        By.CSS_SELECTOR,
+        '[data-test-preprint-title]',
         settings.LONG_TIMEOUT,
     )
     # This locator needs a data-test-selector from software devs
-    # title = Locator(By.CSS_SELECTOR, '[data-test-preprint-title]', settings.LONG_TIMEOUT)
-    title = Locator(By.ID, 'preprintTitle', settings.LONG_TIMEOUT)
+    title = Locator(
+        By.CSS_SELECTOR, '[data-test-preprint-title]', settings.LONG_TIMEOUT
+    )
+    # title = Locator(By.ID, 'preprintTitle', settings.LONG_TIMEOUT)
 
 
 class ReviewsDashboardPage(OSFBasePage):

tests/test_preprints.py

@@ -328,7 +328,7 @@ def test_edit_preprint(self, session, driver, preprint_detail_page):
         assert tag_found
 
     @markers.dont_run_on_prod
-    @pytest.mark.xfail(reason='https://openscience.atlassian.net/browse/ENG-6065')
+    # @pytest.mark.xfail(reason='https://openscience.atlassian.net/browse/ENG-6065')
     def test_withdraw_preprint(self, session, driver, preprint_detail_page):
         """Test the Withdraw Preprint functionality. Using the preprint_detail_page
         fixture we start on the Preprint Detail page for an api created preprint. Then
@@ -341,7 +341,6 @@ def test_withdraw_preprint(self, session, driver, preprint_detail_page):
         that the withdrawal request record is created.
         """
         assert PreprintDetailPage(driver, verify=True)
-        preprint_detail_page.edit_preprint_button.click()
         edit_page = PreprintEditPage(driver)
         WebDriverWait(driver, 5).until(
             EC.element_to_be_clickable(
@@ -363,8 +362,13 @@ def test_withdraw_preprint(self, session, driver, preprint_detail_page):
         )
         assert withdraw_page.request_withdrawal_button.is_enabled()
         withdraw_page.request_withdrawal_button.click()
+        WebDriverWait(driver, 5).until(EC.visibility_of(withdraw_page.withdrawn_banner))
         # Should be redirected back to Preprint Detail page
         assert PendingPreprintDetailPage(driver, verify=True)
+        # Verify that "This preprint has been withdrawn." banner is displayed on Preprint Detail page.
+        assert (
+            withdraw_page.withdrawn_banner.text == 'This preprint has been withdrawn.'
+        )
         # Verify via the api that the Withdrawal Request record was created
         requests = osf_api.get_preprint_requests_records(
             node_id=preprint_detail_page.guid
@@ -374,7 +378,7 @@ def test_withdraw_preprint(self, session, driver, preprint_detail_page):
             record_found = False
             for request in requests:
                 if request['attributes']['request_type'] == 'withdrawal':
-                    assert request['attributes']['machine_state'] == 'pending'
+                    assert request['attributes']['machine_state'] == 'accepted'
                     record_found = True
                     break
             if not record_found: