Code review fixes

Author: jh27539

Diff for: components/accessibility.py

@@ -13,7 +13,7 @@ def run_axe(
         page_name,
         write_files=True,
         terminal_errors=True,
-        exclude_best_practice=False,
+        exclude_best_practice=True,
     ):
         """Use the axe testing engine to perform accessibility checks on a web page
         Parameters:
@@ -25,7 +25,7 @@ def run_axe(
             errors to terminal window - default = True
         - exclude_best_practice - boolean - used to determine whether or not to
             exclude the Best Practice rule set when performing accessibility check.
-            - default = False
+            - set default to True
         """
         axe = Axe(driver)
         # Inject axe-core javascript into page.

Diff for: pages/institutions.py

@@ -45,7 +45,7 @@ class InstitutionBrandedPage(BaseInstitutionPage):
     identity = Locator(By.CSS_SELECTOR, 'img[data-test-institution-banner]')
 
     empty_collection_indicator = Locator(
-        By.CLASS_NAME, 'div[class="_no-results_fvrbco"]'
+        By.CSS_SELECTOR, '[data-test-search-page-no-results]'
     )
 
     # Group Locators
@@ -60,35 +60,3 @@ class InstitutionAdminDashboardPage(BaseInstitutionPage):
 
     identity = Locator(By.CSS_SELECTOR, 'div[data-analytics-scope="Dashboard"]')
     loading_indicator = Locator(By.CSS_SELECTOR, '.ball-scale', settings.LONG_TIMEOUT)
-    departments_listbox_trigger = Locator(
-        By.CSS_SELECTOR,
-        'div.ember-basic-dropdown-trigger.ember-power-select-trigger._select_tdvp4z',
-    )
-    total_user_count = Locator(
-        By.CSS_SELECTOR,
-        'div.ember-view._panel_1dj7yu._sso-users-connected_1w5vdt > div > div._panel-body_1lht4i > div > h3',
-    )
-    total_project_count = Locator(
-        By.CSS_SELECTOR,
-        'div.ember-view._panel_1dj7yu._projects_1w5vdt > div > div._panel-body_1lht4i > div > div > h3',
-    )
-    public_project_count = Locator(
-        By.CSS_SELECTOR, 'div._projects-count_1ky9tx > span:nth-child(1) > strong'
-    )
-    private_project_count = Locator(
-        By.CSS_SELECTOR, 'div._projects-count_1ky9tx > span:nth-child(2) > strong'
-    )
-
-    department_options = GroupLocator(
-        By.CSS_SELECTOR, 'ul.ember-power-select-options > li.ember-power-select-option'
-    )
-    user_table_rows = GroupLocator(
-        By.CSS_SELECTOR,
-        'div._table-wrapper_1w5vdt > div > div.ember-view > div > div > table > tbody > tr',
-    )
-
-    def select_department_from_listbox(self, department):
-        for option in self.department_options:
-            if option.text == department:
-                option.click()
-                break

Diff for: pages/preprints.py

@@ -59,104 +59,12 @@ class PreprintLandingPage(BasePreprintPage):
         '[data-analytics-scope="preprints landing page"]',
         settings.LONG_TIMEOUT,
     )
-    add_preprint_button = Locator(
-        By.CLASS_NAME, '[data-analytics-name="Add a preprint"]', settings.LONG_TIMEOUT
-    )
-    search_button = Locator(By.CSS_SELECTOR, '[data-analytics-name="Search"]')
-    submit_button = Locator(By.CSS_SELECTOR, '[data-test-submit-button]')
 
 
 class PreprintSubmitPage(BasePreprintPage):
     url_addition = 'submit'
 
     identity = Locator(By.CLASS_NAME, 'preprint-submit-header')
-    select_a_service_help_text = Locator(
-        By.CSS_SELECTOR, 'dl[class="dl-horizontal dl-description"]'
-    )
-    select_a_service_save_button = Locator(
-        By.CSS_SELECTOR, '#preprint-form-server button.btn.btn-primary'
-    )
-
-    upload_from_existing_project_button = Locator(
-        By.XPATH, '//button[text()="Select from an existing OSF project"]'
-    )
-    upload_project_selector = Locator(
-        By.CSS_SELECTOR, 'span[class="ember-power-select-placeholder"]'
-    )
-    upload_project_selector_input = Locator(
-        By.CSS_SELECTOR, 'input[class="ember-power-select-search-input"]'
-    )
-    upload_project_help_text = Locator(
-        By.CSS_SELECTOR, '.ember-power-select-option--search-message'
-    )
-    upload_project_selector_project = Locator(
-        By.CSS_SELECTOR, '.ember-power-select-option'
-    )
-    upload_select_file = Locator(By.CSS_SELECTOR, '.file-browser-item > a:nth-child(2)')
-    upload_file_save_continue = Locator(
-        By.CSS_SELECTOR,
-        'div[class="p-t-xs pull-right"] > button[class="btn btn-primary"]',
-    )
-
-    # Author Assertions
-    public_available_button = Locator(
-        By.ID, 'hasDataLinksAvailable', settings.QUICK_TIMEOUT
-    )
-    public_data_input = Locator(
-        By.CSS_SELECTOR, '[data-test-multiple-textbox-index] > input'
-    )
-    preregistration_no_button = Locator(By.ID, 'hasPreregLinksNo')
-    preregistration_input = Locator(By.NAME, 'whyNoPrereg')
-    save_author_assertions = Locator(
-        By.CSS_SELECTOR, '[data-test-author-assertions-continue]'
-    )
-
-    basics_license_dropdown = Locator(
-        By.CSS_SELECTOR, 'select[class="form-control"]', settings.LONG_TIMEOUT
-    )
-    basics_tags_section = Locator(By.CSS_SELECTOR, '#preprint-form-basics .tagsinput')
-    basics_tags_input = Locator(
-        By.CSS_SELECTOR, '#preprint-form-basics .tagsinput input'
-    )
-    basics_abstract_input = Locator(By.NAME, 'basicsAbstract')
-    basics_save_button = Locator(By.CSS_SELECTOR, '#preprint-form-basics .btn-primary')
-
-    first_discipline = Locator(
-        By.CSS_SELECTOR, 'ul[role="listbox"] > li:nth-child(2)', settings.QUICK_TIMEOUT
-    )
-    discipline_save_button = Locator(
-        By.CSS_SELECTOR, '#preprint-form-subjects .btn-primary'
-    )
-
-    authors_save_button = Locator(
-        By.CSS_SELECTOR, '#preprint-form-authors .btn-primary', settings.QUICK_TIMEOUT
-    )
-
-    conflict_of_interest_yes = Locator(By.ID, 'coiYes', settings.QUICK_TIMEOUT)
-    conflict_of_interest_no = Locator(By.ID, 'coiNo', settings.QUICK_TIMEOUT)
-    no_coi_text_box = Locator(
-        By.CSS_SELECTOR, '[data-test-has-no-coi]', settings.QUICK_TIMEOUT
-    )
-    coi_save_button = Locator(By.CSS_SELECTOR, '[data-test-coi-continue]')
-
-    supplemental_create_new_project = Locator(
-        By.CSS_SELECTOR,
-        'div[class="start"] > div[class="row"] > div:nth-child(2)',
-        settings.QUICK_TIMEOUT,
-    )
-    supplemental_save_button = Locator(
-        By.CSS_SELECTOR, '#supplemental-materials .btn-primary'
-    )
-
-    create_preprint_button = Locator(
-        By.CSS_SELECTOR,
-        '.preprint-submit-body .submit-section > div > button.btn.btn-success.btn-md.m-t-md.pull-right',
-    )
-    modal_create_preprint_button = Locator(
-        By.CSS_SELECTOR,
-        '.modal-footer button.btn-success:nth-child(2)',
-        settings.LONG_TIMEOUT,
-    )
 
 
 class PreprintEditPage(GuidBasePage, BasePreprintPage):
@@ -167,46 +75,6 @@ class PreprintEditPage(GuidBasePage, BasePreprintPage):
         By.CSS_SELECTOR, '.m-t-md.preprint-header-preview > p:nth-child(1) > em.m-r-md'
     )
     basics_section = Locator(By.ID, 'preprint-form-basics')
-    basics_tags_section = Locator(By.CSS_SELECTOR, '#preprint-form-basics .tagsinput')
-    basics_tags_input = Locator(
-        By.CSS_SELECTOR, '#preprint-form-basics .tagsinput input'
-    )
-    basics_save_button = Locator(By.CSS_SELECTOR, '#preprint-form-basics .btn-primary')
-    basics_section_changes_saved_indicator = Locator(
-        By.CSS_SELECTOR,
-        '#preprint-form-basics > header > div.preprint-section-status.pull-right > span.text-success.',
-    )
-    discipline_section = Locator(By.ID, 'preprint-form-subjects')
-    discipline_save_button = Locator(
-        By.CSS_SELECTOR, '#preprint-form-subjects .btn-primary'
-    )
-    authors_save_button = Locator(
-        By.CSS_SELECTOR, '#preprint-form-authors .btn-primary', settings.QUICK_TIMEOUT
-    )
-    return_to_preprint_button = Locator(
-        By.CSS_SELECTOR,
-        'div.submit-section > div > button.btn.btn-default.btn-md.m-t-md.pull-right',
-    )
-    withdraw_preprint_button = Locator(
-        By.CSS_SELECTOR,
-        'div.submit-section > div > button.btn.btn-danger.btn-md.m-t-md.pull-right',
-    )
-
-    # Group Locators
-    primary_subjects = GroupLocator(
-        By.CSS_SELECTOR,
-        '#preprint-form-subjects > div > div > div:nth-child(2) > div:nth-child(1) > ul > li',
-    )
-
-    def select_primary_subject_by_name(self, subject_name):
-        """Select a subject from the first box in the Discipline section (i.e. 'primary'
-        subject). This function would need to be modified or another separate function
-        created to select from either of the 2 secondary subject boxes.
-        """
-        for subject in self.primary_subjects:
-            if subject.text == subject_name:
-                subject.click()
-                break
 
 
 class PreprintWithdrawPage(GuidBasePage, BasePreprintPage):
@@ -217,11 +85,6 @@ class PreprintWithdrawPage(GuidBasePage, BasePreprintPage):
         By.CSS_SELECTOR,
         'section.preprint-form-block.preprint-form-section-withdraw-comment',
     )
-    reason_for_withdrawal_textarea = Locator(By.NAME, 'explanation')
-    request_withdrawal_button = Locator(
-        By.CSS_SELECTOR,
-        'div.submit-section > button.btn.btn-danger.btn-md.m-t-md.pull-right',
-    )
 
 
 @pytest.mark.usefixtures('must_be_logged_in')
@@ -232,17 +95,6 @@ class PreprintDiscoverPage(BasePreprintPage):
         By.CSS_SELECTOR, 'a[data-test-topbar-object-type-link="Preprints"]'
     )
     loading_indicator = Locator(By.CSS_SELECTOR, '.ball-scale')
-    search_box = Locator(By.CSS_SELECTOR, 'input[data-test-search-input]')
-    sort_button = Locator(By.CSS_SELECTOR, 'div[data-test-topbar-sort-dropdown]')
-    sort_option_newest_to_oldest = Locator(
-        By.CSS_SELECTOR, '#sortByOptionList > li:nth-child(3) > button'
-    )
-
-    # Group Locators
-    search_results = GroupLocator(By.CSS_SELECTOR, 'div[data-test-search-result-card]')
-    sort_options = GroupLocator(
-        By.CSS_SELECTOR, 'ul[class="ember-power-select-options"]'
-    )
 
 
 @pytest.mark.usefixtures('must_be_logged_in')
@@ -251,15 +103,6 @@ class BrandedPreprintsDiscoverPage(BasePreprintPage):
 
     identity = Locator(By.CSS_SELECTOR, '[data-test-search-provider-logo]')
     loading_indicator = Locator(By.CSS_SELECTOR, '.ball-scale')
-    search_box = Locator(By.CSS_SELECTOR, 'input[data-test-search-input]')
-    sort_button = Locator(By.CSS_SELECTOR, 'div[data-test-topbar-sort-dropdown]')
-    sort_option_newest_to_oldest = Locator(
-        By.CSS_SELECTOR, '#sortByOptionList > li:nth-child(3) > button'
-    )
-    no_results = Locator(By.CSS_SELECTOR, 'div[_no-results_fvrbco]')
-
-    # Group Locators
-    search_results = GroupLocator(By.CSS_SELECTOR, 'div[data-test-search-result-card]')
 
 
 class PreprintDetailPage(GuidBasePage, BasePreprintPage):
@@ -274,31 +117,6 @@ class PreprintDetailPage(GuidBasePage, BasePreprintPage):
         By.CSS_SELECTOR, 'h1[data-test-preprint-title]', settings.LONG_TIMEOUT
     )
     view_page = Locator(By.ID, 'view-page')
-    views_count = Locator(By.CSS_SELECTOR, '[data-test-view-count]')
-    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, 'div[class="edit-preprint-button"]')
-    default_citation = Locator(By.CSS_SELECTOR, '[data-test-default-citation="apa"]')
-
-    # Locators for the reviews app preprint detail page
-    status = Locator(By.CSS_SELECTOR, 'span._status-badge_7ivjq4')
-    status_explanation = Locator(By.CSS_SELECTOR, 'div.status-explanation')
-    withdraw_reason = Locator(By.CSS_SELECTOR, '[data-test-withdrawal-justification]')
-    make_decision_button = Locator(
-        By.CSS_SELECTOR, 'button.btn.dropdown-toggle.btn-success'
-    )
-    accept_radio_button = Locator(By.CSS_SELECTOR, 'input[value="accepted"]')
-    reject_radio_button = Locator(By.CSS_SELECTOR, 'input[value="rejected"]')
-    withdraw_radio_button = Locator(By.CSS_SELECTOR, 'input[value="withdrawn"]')
-    reason_textarea = Locator(By.CSS_SELECTOR, 'textarea.form-control.ember-text-area')
-    submit_decision_button = Locator(By.ID, 'submit-btn')
-
-    # Group Locators
-    subjects = GroupLocator(
-        By.CSS_SELECTOR,
-        '[class="subject-preview"]',
-    )
-    tags = GroupLocator(By.CSS_SELECTOR, 'div.tag-section.p-t-xs > span')
 
 
 class PendingPreprintDetailPage(PreprintDetailPage):
@@ -317,29 +135,6 @@ class ReviewsDashboardPage(OSFBasePage):
     url = settings.OSF_HOME + '/reviews'
     identity = Locator(By.CLASS_NAME, '_reviews-dashboard-header_jdu5ey')
     loading_indicator = Locator(By.CSS_SELECTOR, '.ball-scale')
-    provider_group_links = GroupLocator(
-        By.CSS_SELECTOR, 'li._provider-links-component_gp8jcl'
-    )
-
-    def click_provider_group_link(self, provider_name, link_name):
-        """Search through the Provider Groups in the sidebar on the right side of the
-        Reviews Dashboard page to find the group with the given provider_name.  When
-        the provider group is found, then search through the links in the group for the
-        given link_name. Click this link when found.
-        """
-        for provider_group in self.provider_group_links:
-            group_name = provider_group.find_element_by_css_selector(
-                'span._provider-name_gp8jcl'
-            )
-            if provider_name == group_name.text:
-                links = provider_group.find_elements_by_css_selector(
-                    'ul._provider-links_gp8jcl > li > a'
-                )
-                for link in links:
-                    if link_name in link.text:
-                        link.click()
-                        break
-                break
 
 
 class BaseReviewsPage(OSFBasePage):
@@ -402,19 +197,6 @@ class ReviewsWithdrawalsPage(BaseReviewsPage):
     url_addition = 'withdrawals'
     identity = Locator(By.CLASS_NAME, '_reviews-list-heading_k45x8p')
     loading_indicator = Locator(By.CSS_SELECTOR, '.ball-scale')
-    requests = GroupLocator(By.CSS_SELECTOR, 'div._moderation-list-row_17iwzt')
-
-    def click_requests_row(self, provider_id, preprint_id):
-        """Search through the rows of requests on the Reviews Withdrawal Requests
-        page to find the preprint that has the given preprint_id in its url. When the
-        row is found click it to open the Preprint Detail page for that preprint.
-        """
-        for row in self.requests:
-            url = row.find_element_by_css_selector('a').get_attribute('href')
-            node_id = url.split(provider_id + '/', 1)[1]
-            if node_id == preprint_id:
-                row.find_element_by_css_selector('div[title]').click()
-                break
 
 
 class ReviewsModeratorsPage(BaseReviewsPage):

Diff for: tests/test_a11y_other_osf.py

@@ -63,8 +63,7 @@ def test_accessibility(
         my_projects_page.goto()
         assert MyProjectsPage(driver, verify=True)
         my_projects_page.empty_collection_indicator.present()
-        pytest.xfail("Color-contrast issue documented here -> ENG-3616"
-                     "List issue documented here -> ENG-3146")
+        pytest.xfail("Color-contrast issue documented here -> ENG-3616. List issue documented here -> ENG-3146")
         a11y.run_axe(
             driver,
             session,

Diff for: tests/test_a11y_preprints.py

@@ -293,7 +293,7 @@ def test_accessibility_reviews_moderators(
             session,
             'revmod',
             write_files=write_files,
-            exclude_best_practice=1,
+            exclude_best_practice=True,
         )
 
     def test_accessibility_reviews_notifications(

Diff for: tests/test_a11y_user.py

@@ -181,8 +181,7 @@ def test_accessibility(
         assert NotificationsPage(driver, verify=True)
         # wait for Notification Preferences section to finish loading
         notifications_page.loading_indicator.here_then_gone()
-        pytest.xfail("Label issue documented here -> ENG-3074"
-                     "Color-contrast issue documented here -> ENG-3075")
+        pytest.xfail("Label issue documented here -> ENG-3074. Color-contrast issue documented here -> ENG-3075")
         a11y.run_axe(
             driver,
             session,