Merge branch 'develop' of github.com:CenterForOpenScience/osf-selenium-tests into develop

Author: Shtogryn

.github/workflows/nightly_core_functionality_tests.yml

@@ -43,9 +43,9 @@ env:
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     strategy:
       matrix:
@@ -73,14 +73,14 @@ jobs:
   core_functionality_test:
     name: Core Functionality tests (${{ matrix.browser }})
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     strategy:
       fail-fast: false
       max-parallel: 1  # run in series
       matrix:
-        browser: [chrome, firefox, edge]
+        browser: [firefox, edge, chrome]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.9

.github/workflows/production_smoke_tests.yml

@@ -39,9 +39,9 @@ env:
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     strategy:
       matrix:
@@ -69,9 +69,9 @@ jobs:
   smoke_test:
     name: Prod smoke tests (${{ matrix.browser }})
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     strategy:
       fail-fast: false
       max-parallel: 1  # run in series

.github/workflows/two_minute_drill.yml

@@ -52,9 +52,9 @@ env:
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     strategy:
       matrix:
@@ -82,9 +82,9 @@ jobs:
   two_minute_drill_tests:
     name: Two Minute Drill Tests (${{ github.event.inputs.browser }})
     needs: [build]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     strategy:
       fail-fast: false
       max-parallel: 1  # run in series

.github/workflows/weekly_regression_tests.yml

@@ -84,9 +84,9 @@ env:
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     strategy:
       matrix:
@@ -116,7 +116,7 @@ jobs:
   # will be used since the scheduler does not have inputs.
   set_variables:
     name: Set the Domain, Service, and Browser for Regression Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       domain: ${{ github.event.inputs.domain || env.DEFAULT_DOMAIN }}
       service: ${{ github.event.inputs.service || env.DEFAULT_SERVICE }}
@@ -130,7 +130,7 @@ jobs:
   set_matrix:
     name: Set Matrix of Browser Values
     needs: [set_variables]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set_browser_2.outputs.matrix }}
     steps:
@@ -147,9 +147,9 @@ jobs:
   regression_test:
     name: Regression tests (${{ matrix.browser }})
     needs: [build, set_variables, set_matrix]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-latest
     strategy:
       fail-fast: false
       max-parallel: 1  # run in series

api/osf_api.py

@@ -46,7 +46,7 @@ def create_child_node(
     node_id=None,
     title='osf selenium child node',
     tags=None,
-    **kwargs
+    **kwargs,
 ):
     """Create a child node (a.k.a. component) of a given project node."""
     if tags is None:
@@ -863,6 +863,43 @@ def accept_moderated_preprint(session=None, preprint_node=None):
     )
 
 
+def get_preprint_id(session=None, preprint_node=None):
+    """Get priprint's id"""
+    if not session:
+        session = get_default_session()
+    request_url = f'/v2/preprints/{preprint_node}/requests/'
+
+    response = session.get(url=request_url)
+    preprint_id = ''
+    for item in response.get('data', []):
+        preprint_id = item.get('id')
+    return preprint_id
+
+
+def accept_withdraw_preprint(session=None, preprint_id=None):
+    """Accept a withdrawal request for a given preprint request ID."""
+    if not session:
+        session = get_default_session()
+    review_url = '/v2/actions/requests/preprints/'
+    review_payload = {
+        'data': {
+            'type': 'preprint-request-actions',
+            'attributes': {
+                'trigger': 'accept',
+                'comment': 'Preprint Withdraw Approval via OSF api',
+            },
+            'relationships': {
+                'target': {'data': {'id': preprint_id, 'type': 'preprint-requests'}}
+            },
+        }
+    }
+    session.post(
+        url=review_url,
+        item_type='review-actions',
+        raw_body=json.dumps(review_payload),
+    )
+
+
 def create_preprint_withdrawal_request(session=None, preprint_node=None):
     """Create a withdrawal request for a given preprint node id."""
     if not session:
@@ -1279,3 +1316,45 @@ def create_registration_resource(registration_guid, resource_type):
         item_id=resource_id,
         item_type='resources',
     )['data']
+
+
+def update_registration_title(registration_guid, title):
+    """This method updates the title of the given
+    registration."""
+    session = client.Session(
+        api_base_url=settings.API_DOMAIN,
+        auth=(settings.REGISTRATIONS_USER, settings.REGISTRATIONS_USER_PASSWORD),
+    )
+    url = '/v2/registrations/{}/'.format(registration_guid)
+    payload = {
+        'data': {
+            'id': registration_guid,
+            'type': 'registrations',
+            'attributes': {'title': title},
+        }
+    }
+    session.patch(
+        url=url,
+        raw_body=json.dumps(payload),
+        item_id=registration_guid,
+        item_type='registrations',
+    )['data']
+
+
+def delete_registration_contributor(registration_guid, user_name):
+    """This method deletes the given user from the given registration"""
+    session = client.Session(
+        api_base_url=settings.API_DOMAIN,
+        auth=(settings.REGISTRATIONS_USER, settings.REGISTRATIONS_USER_PASSWORD),
+    )
+    url = '/v2/registrations/{}/contributors/'.format(registration_guid)
+    data = session.get(url)['data']
+
+    for i in range(0, len(data)):
+        if user_name in data[i]['embeds']['users']['data']['attributes']['full_name']:
+            user_id = data[i]['embeds']['users']['data']['id']
+            delete_url = '/v2/registrations/{}/contributors/{}/'.format(
+                registration_guid, user_id
+            )
+            session.delete(delete_url, item_type='users')
+            break

pages/preprints.py

@@ -258,7 +258,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.']"
     )
 
 
@@ -313,6 +316,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
@@ -341,8 +345,10 @@ class PendingPreprintDetailPage(PreprintDetailPage):
         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):

pages/project.py

@@ -563,11 +563,13 @@ class ProjectMetadataPage(GuidBasePage):
     add_contributor_button = Locator(
         By.CSS_SELECTOR, 'a.btn.btn-success.btn-sm.m-l-md[href="#addContributors"]'
     )
-    contributor_search_button = Locator(By.XPATH, '//input[@class="btn btn-default"]')
+    contributor_search_button = Locator(
+        By.CSS_SELECTOR, '[data-test-user-search-button]'
+    )
     add_displayed_contributor_button = Locator(
         By.CSS_SELECTOR, '[a.btn.btn-success.contrib-button.btn-mini]'
     )
-    search_input = Locator(By.XPATH, '//input[@class="form-control"]')
+    search_input = Locator(By.CSS_SELECTOR, '[data-test-user-search-input]')
     resource_type = Locator(
         By.CSS_SELECTOR, '[data-test-display-resource-type-general]'
     )
@@ -595,6 +597,37 @@ def select_from_dropdown_listbox(self, selection):
     resource_information_save_button = Locator(
         By.CSS_SELECTOR, '[data-test-save-resource-metadata-button]'
     )
+    # Get the rows of search results matching the locator
+    rows = GroupLocator(By.CSS_SELECTOR, '[data-test-user-card-main]')
+
+    # Select the correct user from the table of search results
+    def select_from_table_of_rows(self, selection):
+        for row in self.rows:
+            cell = row.find_element(
+                By.CSS_SELECTOR, '[data-analytics-name="View user"]'
+            )
+            if selection in cell.text.strip():
+                row.find_element(
+                    By.CSS_SELECTOR, '[data-test-add-contributor-button]'
+                ).click()
+                break
+
+    contributors_list = GroupLocator(
+        By.CSS_SELECTOR, '[data-analytics-name="Contributor name"]'
+    )
+
+    # Select new_user from contributors list on metadata page
+    def select_from_list(self, selection):
+        for contributor in self.contributors_list:
+            if selection in contributor.text.strip():
+                return contributor
+
+    search_cancel_button = Locator(
+        By.CSS_SELECTOR, '[data-test-user-search-cancel-button]'
+    )
+    add_contributor_finish_button = Locator(
+        By.CSS_SELECTOR, '[data-test-finish-node-contributor-editing-button]'
+    )
 
     funder_name = Locator(By.XPATH, '//span[@class="ember-power-select-status-icon"]')
     funder_name_search_input = Locator(

pages/registries.py

@@ -143,22 +143,27 @@ def select_from_dropdown_listbox(self, selection):
 class RegistrationMetadataPage(BaseSubmittedRegistrationPage):
     url_addition = 'metadata'
     identity = Locator(By.CSS_SELECTOR, '[data-test-display-resource-type-general]')
-
+    metadata_title = Locator(By.CSS_SELECTOR, '[data-test-display-node-title]')
     metadata_description = Locator(
         By.CSS_SELECTOR, '[data-test-display-node-description]'
     )
     edit_metadata_description_button = Locator(
         By.CSS_SELECTOR, '[data-test-edit-node-description-button]'
     )
+    save_metadata_title_button = Locator(
+        By.CSS_SELECTOR, '[data-test-save-node-title-button]'
+    )
     save_metadata_description_button = Locator(
         By.CSS_SELECTOR, '[data-test-save-node-description-button]'
     )
     contributors_list = Locator(By.CSS_SELECTOR, '[data-test-contributors-list]')
-    contributor_search_button = Locator(By.XPATH, '//input[@class="btn btn-default"]')
+    contributor_search_button = Locator(
+        By.CSS_SELECTOR, '[data-test-user-search-button]'
+    )
     add_displayed_contributor_button = Locator(
         By.CSS_SELECTOR, '[a.btn.btn-success.contrib-button.btn-mini]'
     )
-    search_input = Locator(By.XPATH, '//input[@class="form-control"]')
+    search_input = Locator(By.CSS_SELECTOR, '[data-test-user-search-input]')
     resource_type = Locator(
         By.CSS_SELECTOR, '[data-test-display-resource-type-general]'
     )
@@ -183,6 +188,35 @@ def select_from_dropdown_listbox(self, selection):
                 option.click()
                 break
 
+    rows = GroupLocator(By.CSS_SELECTOR, '[data-test-user-card-main]')
+
+    def select_from_table_of_rows(self, selection):
+        for row in self.rows:
+            cell = row.find_element(
+                By.CSS_SELECTOR, '[data-analytics-name="View user"]'
+            )
+            if selection in cell.text.strip():
+                row.find_element(
+                    By.CSS_SELECTOR, '[data-test-add-contributor-button]'
+                ).click()
+                break
+
+    contributors_list = GroupLocator(
+        By.CSS_SELECTOR, '[data-analytics-name="Contributor name"]'
+    )
+
+    def select_from_list(self, selection):
+        for contributor in self.contributors_list:
+            if selection in contributor.text.strip():
+                return contributor
+
+    search_cancel_button = Locator(
+        By.CSS_SELECTOR, '[data-test-user-search-cancel-button]'
+    )
+    add_contributor_finish_button = Locator(
+        By.CSS_SELECTOR, '[data-test-finish-node-contributor-editing-button]'
+    )
+
     resource_information_save_button = Locator(
         By.CSS_SELECTOR, '[data-test-save-resource-metadata-button]'
     )

pages/user.py

@@ -147,7 +147,7 @@ def get_unconfirmed_email_item(self, email_address):
 class ConfigureAddonsPage(BaseUserSettingsPage):
     url = settings.OSF_HOME + '/settings/addons/'
 
-    identity = Locator(By.CSS_SELECTOR, '#configureAddons')
+    identity = Locator(By.CSS_SELECTOR, 'div[data-analytics-scope="User addons"]')
 
 
 class NotificationsPage(BaseUserSettingsPage):

requirements.txt

@@ -7,7 +7,7 @@ autopep8==1.3.3
 requests>=2.20.0
 urllib3<2
 pythosf==0.0.9
-environs==3.0.0
+environs==14.1.1
 faker==0.9.0
 pre-commit==2.14.0
 ipdb==0.13.13