From 1db52c79ad0b2499fb10fb0c68098c3994441642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 15 Oct 2018 14:23:43 +0200 Subject: Disable the QA/ElementWithPattern cop for existing offenses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- qa/qa/page/README.md | 38 +++++++++++++--------- qa/qa/page/component/clone_panel.rb | 4 +-- qa/qa/page/dashboard/groups.rb | 6 ++-- qa/qa/page/dashboard/projects.rb | 2 +- qa/qa/page/file/form.rb | 6 ++-- qa/qa/page/file/shared/commit_message.rb | 2 +- qa/qa/page/file/show.rb | 6 ++-- qa/qa/page/group/new.rb | 10 +++--- qa/qa/page/group/show.rb | 2 +- qa/qa/page/issuable/sidebar.rb | 4 +-- qa/qa/page/layout/banner.rb | 2 +- qa/qa/page/main/menu.rb | 6 ++-- qa/qa/page/main/oauth.rb | 2 +- qa/qa/page/merge_request/show.rb | 6 ++-- qa/qa/page/profile/menu.rb | 8 ++--- qa/qa/page/profile/personal_access_tokens.rb | 8 ++--- qa/qa/page/project/activity.rb | 2 +- qa/qa/page/project/fork/new.rb | 2 +- qa/qa/page/project/import/github.rb | 12 +++---- qa/qa/page/project/issue/index.rb | 2 +- qa/qa/page/project/issue/new.rb | 6 ++-- qa/qa/page/project/issue/show.rb | 10 +++--- qa/qa/page/project/job/show.rb | 6 ++-- qa/qa/page/project/menu.rb | 26 +++++++-------- qa/qa/page/project/new.rb | 16 ++++----- qa/qa/page/project/operations/kubernetes/add.rb | 2 +- .../project/operations/kubernetes/add_existing.rb | 10 +++--- qa/qa/page/project/operations/kubernetes/index.rb | 2 +- qa/qa/page/project/operations/kubernetes/show.rb | 8 ++--- qa/qa/page/project/pipeline/index.rb | 2 +- qa/qa/page/project/pipeline/show.rb | 10 +++--- qa/qa/page/project/settings/advanced.rb | 6 ++-- qa/qa/page/project/settings/ci_cd.rb | 10 +++--- qa/qa/page/project/settings/common.rb | 2 +- qa/qa/page/project/settings/deploy_keys.rb | 12 +++---- qa/qa/page/project/settings/runners.rb | 6 ++-- qa/qa/page/project/settings/secret_variables.rb | 10 +++--- qa/qa/page/project/show.rb | 8 ++--- qa/qa/page/project/wiki/edit.rb | 6 ++-- qa/qa/page/project/wiki/new.rb | 12 +++---- qa/qa/page/project/wiki/show.rb | 2 +- qa/spec/page/base_spec.rb | 6 ++-- qa/spec/page/view_spec.rb | 4 +-- 43 files changed, 160 insertions(+), 152 deletions(-) diff --git a/qa/qa/page/README.md b/qa/qa/page/README.md index dfad460a9a5..4d58f1a43b7 100644 --- a/qa/qa/page/README.md +++ b/qa/qa/page/README.md @@ -70,15 +70,15 @@ module Page module Main class Login < Page::Base view 'app/views/devise/passwords/edit.html.haml' do - element :password_field, 'password_field :password' - element :password_confirmation, 'password_field :password_confirmation' - element :change_password_button, 'submit "Change your password"' + element :password_field + element :password_confirmation + element :change_password_button end view 'app/views/devise/sessions/_new_base.html.haml' do - element :login_field, 'text_field :login' - element :password_field, 'password_field :password' - element :sign_in_button, 'submit "Sign in"' + element :login_field + element :password_field + element :sign_in_button end # ... @@ -87,23 +87,31 @@ end ``` The `view` DSL method declares the filename of the view where an -`element` is implmented. +`element` is implemented. -The `element` DSL method in turn declares an element and defines a value -to match to the actual view code. It is possible to use `element` with value, -with a String value or with a Regexp. +The `element` DSL method in turn declares an element for which a corresponding +`qa-element-name-dasherized` CSS class need to be added to the view file. + +You can also define a value (String or Regexp) to match to the actual view +code but **this is deprecated** in favor of the above method for two reasons: + +- Consistency: there is only one way to define an element +- Separation of concerns: QA uses dedicated CSS classes instead of reusing code + or classes used by other components (e.g. `js-*` classes etc.) ```ruby view 'app/views/my/view.html.haml' do + # Implicitly require `.qa-logout-button` CSS class to be present in the view + element :logout_button + + ## This is deprecated and forbidden by the `QA/ElementWithPattern` RuboCop cop. # Require `f.submit "Sign in"` to be present in `my/view.html.haml - element :my_button, 'f.submit "Sign in"' + element :my_button, 'f.submit "Sign in"' # rubocop:disable QA/ElementWithPattern + ## This is deprecated and forbidden by the `QA/ElementWithPattern` RuboCop cop. # Match every line in `my/view.html.haml` against # `/link_to .* "My Profile"/` regexp. - element :profile_link, /link_to .* "My Profile"/ - - # Implicitly require `.qa-logout-button` CSS class to be present in the view - element :logout_button + element :profile_link, /link_to .* "My Profile"/ # rubocop:disable QA/ElementWithPattern end ``` diff --git a/qa/qa/page/component/clone_panel.rb b/qa/qa/page/component/clone_panel.rb index 8e8ff4e3bb0..94e761b0e0c 100644 --- a/qa/qa/page/component/clone_panel.rb +++ b/qa/qa/page/component/clone_panel.rb @@ -7,8 +7,8 @@ module QA def self.included(base) base.view 'app/views/shared/_clone_panel.html.haml' do element :clone_dropdown - element :clone_options_dropdown, '.clone-options-dropdown' - element :project_repository_location, 'text_field_tag :project_clone' + element :clone_options_dropdown, '.clone-options-dropdown' # rubocop:disable QA/ElementWithPattern + element :project_repository_location, 'text_field_tag :project_clone' # rubocop:disable QA/ElementWithPattern end end diff --git a/qa/qa/page/dashboard/groups.rb b/qa/qa/page/dashboard/groups.rb index c6ef932e33f..7a07515de62 100644 --- a/qa/qa/page/dashboard/groups.rb +++ b/qa/qa/page/dashboard/groups.rb @@ -7,12 +7,12 @@ module QA include Page::Component::GroupsFilter view 'app/views/shared/groups/_search_form.html.haml' do - element :groups_filter, 'search_field_tag :filter' - element :groups_filter_placeholder, 'Search by name' + element :groups_filter, 'search_field_tag :filter' # rubocop:disable QA/ElementWithPattern + element :groups_filter_placeholder, 'Search by name' # rubocop:disable QA/ElementWithPattern end view 'app/views/dashboard/_groups_head.html.haml' do - element :new_group_button, 'link_to _("New group")' + element :new_group_button, 'link_to _("New group")' # rubocop:disable QA/ElementWithPattern end def has_group?(name) diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb index 5b2827c089c..0f434577b3b 100644 --- a/qa/qa/page/dashboard/projects.rb +++ b/qa/qa/page/dashboard/projects.rb @@ -5,7 +5,7 @@ module QA view 'app/views/dashboard/projects/index.html.haml' view 'app/views/shared/projects/_search_form.html.haml' do - element :form_filter_by_name, /form_tag.+id: 'project-filter-form'/ + element :form_filter_by_name, /form_tag.+id: 'project-filter-form'/ # rubocop:disable QA/ElementWithPattern end def go_to_project(name) diff --git a/qa/qa/page/file/form.rb b/qa/qa/page/file/form.rb index 3752f5066c9..a1534231691 100644 --- a/qa/qa/page/file/form.rb +++ b/qa/qa/page/file/form.rb @@ -6,12 +6,12 @@ module QA include Page::Component::DropdownFilter view 'app/views/projects/blob/_editor.html.haml' do - element :file_name, "text_field_tag 'file_name'" - element :editor, '#editor' + element :file_name, "text_field_tag 'file_name'" # rubocop:disable QA/ElementWithPattern + element :editor, '#editor' # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/_commit_button.html.haml' do - element :commit_changes, "button_tag 'Commit changes'" + element :commit_changes, "button_tag 'Commit changes'" # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/blob/_template_selectors.html.haml' do diff --git a/qa/qa/page/file/shared/commit_message.rb b/qa/qa/page/file/shared/commit_message.rb index 5af1a55e2ef..aa1bb081cd3 100644 --- a/qa/qa/page/file/shared/commit_message.rb +++ b/qa/qa/page/file/shared/commit_message.rb @@ -5,7 +5,7 @@ module QA module CommitMessage def self.included(base) base.view 'app/views/shared/_commit_message_container.html.haml' do - element :commit_message, "text_area_tag 'commit_message'" + element :commit_message, "text_area_tag 'commit_message'" # rubocop:disable QA/ElementWithPattern end end diff --git a/qa/qa/page/file/show.rb b/qa/qa/page/file/show.rb index 99f5924b67f..abd8ebb089f 100644 --- a/qa/qa/page/file/show.rb +++ b/qa/qa/page/file/show.rb @@ -5,12 +5,12 @@ module QA include Shared::CommitMessage view 'app/helpers/blob_helper.rb' do - element :edit_button, "_('Edit')" - element :delete_button, /label:\s+"Delete"/ + element :edit_button, "_('Edit')" # rubocop:disable QA/ElementWithPattern + element :delete_button, /label:\s+"Delete"/ # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/blob/_remove.html.haml' do - element :delete_file_button, "button_tag 'Delete file'" + element :delete_file_button, "button_tag 'Delete file'" # rubocop:disable QA/ElementWithPattern end def click_edit diff --git a/qa/qa/page/group/new.rb b/qa/qa/page/group/new.rb index 48b71a7c883..39584daf334 100644 --- a/qa/qa/page/group/new.rb +++ b/qa/qa/page/group/new.rb @@ -3,14 +3,14 @@ module QA module Group class New < Page::Base view 'app/views/shared/_group_form.html.haml' do - element :group_path_field, 'text_field :path' - element :group_name_field, 'text_field :name' - element :group_description_field, 'text_area :description' + element :group_path_field, 'text_field :path' # rubocop:disable QA/ElementWithPattern + element :group_name_field, 'text_field :name' # rubocop:disable QA/ElementWithPattern + element :group_description_field, 'text_area :description' # rubocop:disable QA/ElementWithPattern end view 'app/views/groups/new.html.haml' do - element :create_group_button, "submit 'Create group'" - element :visibility_radios, 'visibility_level:' + element :create_group_button, "submit 'Create group'" # rubocop:disable QA/ElementWithPattern + element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern end def set_path(path) diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb index 58a9e861971..0f0ab81a4ef 100644 --- a/qa/qa/page/group/show.rb +++ b/qa/qa/page/group/show.rb @@ -15,7 +15,7 @@ module QA end view 'app/assets/javascripts/groups/constants.js' do - element :no_result_text, 'No groups or projects matched your search' + element :no_result_text, 'No groups or projects matched your search' # rubocop:disable QA/ElementWithPattern end def go_to_subgroup(name) diff --git a/qa/qa/page/issuable/sidebar.rb b/qa/qa/page/issuable/sidebar.rb index f207264e24f..d3751b712c9 100644 --- a/qa/qa/page/issuable/sidebar.rb +++ b/qa/qa/page/issuable/sidebar.rb @@ -3,8 +3,8 @@ module QA module Issuable class Sidebar < Page::Base view 'app/views/shared/issuable/_sidebar.html.haml' do - element :labels_block, ".issuable-show-labels" - element :milestones_block, '.block.milestone' + element :labels_block, ".issuable-show-labels" # rubocop:disable QA/ElementWithPattern + element :milestones_block, '.block.milestone' # rubocop:disable QA/ElementWithPattern end def has_label?(label) diff --git a/qa/qa/page/layout/banner.rb b/qa/qa/page/layout/banner.rb index e7654bdafc9..2223f2adec8 100644 --- a/qa/qa/page/layout/banner.rb +++ b/qa/qa/page/layout/banner.rb @@ -3,7 +3,7 @@ module QA module Layout class Banner < Page::Base view 'app/views/layouts/header/_read_only_banner.html.haml' do - element :flash_notice, ".flash-notice" + element :flash_notice, ".flash-notice" # rubocop:disable QA/ElementWithPattern end def has_notice?(message) diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index a2ee696e1b3..fb45ebef1b6 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -5,14 +5,14 @@ module QA module Main class Menu < Page::Base view 'app/views/layouts/header/_current_user_dropdown.html.haml' do - element :user_sign_out_link, 'link_to _("Sign out")' - element :settings_link, 'link_to s_("CurrentUser|Settings")' + element :user_sign_out_link, 'link_to _("Sign out")' # rubocop:disable QA/ElementWithPattern + element :settings_link, 'link_to s_("CurrentUser|Settings")' # rubocop:disable QA/ElementWithPattern end view 'app/views/layouts/header/_default.html.haml' do element :navbar element :user_avatar - element :user_menu, '.dropdown-menu' + element :user_menu, '.dropdown-menu' # rubocop:disable QA/ElementWithPattern end view 'app/views/layouts/nav/_dashboard.html.haml' do diff --git a/qa/qa/page/main/oauth.rb b/qa/qa/page/main/oauth.rb index 618f114e058..bc44d274314 100644 --- a/qa/qa/page/main/oauth.rb +++ b/qa/qa/page/main/oauth.rb @@ -3,7 +3,7 @@ module QA module Main class OAuth < Page::Base view 'app/views/doorkeeper/authorizations/new.html.haml' do - element :authorization_button, 'submit_tag _("Authorize")' + element :authorization_button, 'submit_tag _("Authorize")' # rubocop:disable QA/ElementWithPattern end def needs_authorization? diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index d9254d89541..b40e90ef4ad 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -4,19 +4,19 @@ module QA class Show < Page::Base view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do element :merge_button - element :fast_forward_message, 'Fast-forward merge without a merge commit' + element :fast_forward_message, 'Fast-forward merge without a merge commit' # rubocop:disable QA/ElementWithPattern element :merge_moment_dropdown element :merge_when_pipeline_succeeds_option element :merge_immediately_option end view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do - element :merged_status, 'The changes were merged into' + element :merged_status, 'The changes were merged into' # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue' do element :mr_rebase_button - element :no_fast_forward_message, 'Fast-forward merge is not possible' + element :no_fast_forward_message, 'Fast-forward merge is not possible' # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue' do diff --git a/qa/qa/page/profile/menu.rb b/qa/qa/page/profile/menu.rb index f8a7d64e016..2d503499e13 100644 --- a/qa/qa/page/profile/menu.rb +++ b/qa/qa/page/profile/menu.rb @@ -5,10 +5,10 @@ module QA module Profile class Menu < Page::Base view 'app/views/layouts/nav/sidebar/_profile.html.haml' do - element :access_token_link, 'link_to profile_personal_access_tokens_path' - element :access_token_title, 'Access Tokens' - element :top_level_items, '.sidebar-top-level-items' - element :ssh_keys, 'SSH Keys' + element :access_token_link, 'link_to profile_personal_access_tokens_path' # rubocop:disable QA/ElementWithPattern + element :access_token_title, 'Access Tokens' # rubocop:disable QA/ElementWithPattern + element :top_level_items, '.sidebar-top-level-items' # rubocop:disable QA/ElementWithPattern + element :ssh_keys, 'SSH Keys' # rubocop:disable QA/ElementWithPattern end def click_access_tokens diff --git a/qa/qa/page/profile/personal_access_tokens.rb b/qa/qa/page/profile/personal_access_tokens.rb index f5ae47dadd0..2f0202951bb 100644 --- a/qa/qa/page/profile/personal_access_tokens.rb +++ b/qa/qa/page/profile/personal_access_tokens.rb @@ -3,13 +3,13 @@ module QA module Profile class PersonalAccessTokens < Page::Base view 'app/views/shared/_personal_access_tokens_form.html.haml' do - element :personal_access_token_name_field, 'text_field :name' - element :create_token_button, 'submit "Create #{type} token"' # rubocop:disable Lint/InterpolationCheck - element :scopes_api_radios, "label :scopes" + element :personal_access_token_name_field, 'text_field :name' # rubocop:disable QA/ElementWithPattern + element :create_token_button, 'submit "Create #{type} token"' # rubocop:disable QA/ElementWithPattern, Lint/InterpolationCheck + element :scopes_api_radios, "label :scopes" # rubocop:disable QA/ElementWithPattern end view 'app/views/profiles/personal_access_tokens/index.html.haml' do - element :create_token_field, "text_field_tag 'created-personal-access-token'" + element :create_token_field, "text_field_tag 'created-personal-access-token'" # rubocop:disable QA/ElementWithPattern end def fill_token_name(name) diff --git a/qa/qa/page/project/activity.rb b/qa/qa/page/project/activity.rb index a0500b4d31a..56fbaa90790 100644 --- a/qa/qa/page/project/activity.rb +++ b/qa/qa/page/project/activity.rb @@ -3,7 +3,7 @@ module QA module Project class Activity < Page::Base view 'app/views/shared/_event_filter.html.haml' do - element :push_events, "event_filter_link EventFilter::PUSH, _('Push events')" + element :push_events, "event_filter_link EventFilter::PUSH, _('Push events')" # rubocop:disable QA/ElementWithPattern end def go_to_push_events diff --git a/qa/qa/page/project/fork/new.rb b/qa/qa/page/project/fork/new.rb index ed92df956bf..140c004b458 100644 --- a/qa/qa/page/project/fork/new.rb +++ b/qa/qa/page/project/fork/new.rb @@ -4,7 +4,7 @@ module QA module Fork class New < Page::Base view 'app/views/projects/forks/_fork_button.html.haml' do - element :namespace, 'link_to project_forks_path' + element :namespace, 'link_to project_forks_path' # rubocop:disable QA/ElementWithPattern end def choose_namespace(namespace = Runtime::Namespace.path) diff --git a/qa/qa/page/project/import/github.rb b/qa/qa/page/project/import/github.rb index 1a410a0f8a5..a3cde73d3f2 100644 --- a/qa/qa/page/project/import/github.rb +++ b/qa/qa/page/project/import/github.rb @@ -6,16 +6,16 @@ module QA include Page::Component::Select2 view 'app/views/import/github/new.html.haml' do - element :personal_access_token_field, 'text_field_tag :personal_access_token' - element :list_repos_button, "submit_tag _('List your GitHub repositories')" + element :personal_access_token_field, 'text_field_tag :personal_access_token' # rubocop:disable QA/ElementWithPattern + element :list_repos_button, "submit_tag _('List your GitHub repositories')" # rubocop:disable QA/ElementWithPattern end view 'app/views/import/_githubish_status.html.haml' do - element :project_import_row, 'data: { qa: { repo_path: repo.full_name } }' + element :project_import_row, 'data: { qa: { repo_path: repo.full_name } }' # rubocop:disable QA/ElementWithPattern element :project_namespace_select - element :project_namespace_field, 'select_tag :namespace_id' - element :project_path_field, 'text_field_tag :path, sanitize_project_name(repo.name)' - element :import_button, "_('Import')" + element :project_namespace_field, 'select_tag :namespace_id' # rubocop:disable QA/ElementWithPattern + element :project_path_field, 'text_field_tag :path, sanitize_project_name(repo.name)' # rubocop:disable QA/ElementWithPattern + element :import_button, "_('Import')" # rubocop:disable QA/ElementWithPattern end def add_personal_access_token(personal_access_token) diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb index b5903f536a4..1035bf74a43 100644 --- a/qa/qa/page/project/issue/index.rb +++ b/qa/qa/page/project/issue/index.rb @@ -4,7 +4,7 @@ module QA module Issue class Index < Page::Base view 'app/views/projects/issues/_issue.html.haml' do - element :issue_link, 'link_to issue.title' + element :issue_link, 'link_to issue.title' # rubocop:disable QA/ElementWithPattern end def go_to_issue(title) diff --git a/qa/qa/page/project/issue/new.rb b/qa/qa/page/project/issue/new.rb index 7fc581da1ed..03b605ab24b 100644 --- a/qa/qa/page/project/issue/new.rb +++ b/qa/qa/page/project/issue/new.rb @@ -4,15 +4,15 @@ module QA module Issue class New < Page::Base view 'app/views/shared/issuable/_form.html.haml' do - element :submit_issue_button, 'form.submit "Submit' + element :submit_issue_button, 'form.submit "Submit' # rubocop:disable QA/ElementWithPattern end view 'app/views/shared/issuable/form/_title.html.haml' do - element :issue_title_textbox, 'form.text_field :title' + element :issue_title_textbox, 'form.text_field :title' # rubocop:disable QA/ElementWithPattern end view 'app/views/shared/form_elements/_description.html.haml' do - element :issue_description_textarea, "render 'projects/zen', f: form, attr: :description" + element :issue_description_textarea, "render 'projects/zen', f: form, attr: :description" # rubocop:disable QA/ElementWithPattern end def add_title(title) diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb index 9a738f56202..1062f0b2dbb 100644 --- a/qa/qa/page/project/issue/show.rb +++ b/qa/qa/page/project/issue/show.rb @@ -8,17 +8,17 @@ module QA include Page::Component::Issuable::Common view 'app/views/projects/issues/show.html.haml' do - element :issue_details, '.issue-details' - element :title, '.title' + element :issue_details, '.issue-details' # rubocop:disable QA/ElementWithPattern + element :title, '.title' # rubocop:disable QA/ElementWithPattern end view 'app/views/shared/notes/_form.html.haml' do - element :new_note_form, 'new-note' - element :new_note_form, 'attr: :note' + element :new_note_form, 'new-note' # rubocop:disable QA/ElementWithPattern + element :new_note_form, 'attr: :note' # rubocop:disable QA/ElementWithPattern end view 'app/views/shared/notes/_comment_button.html.haml' do - element :comment_button, '%strong Comment' + element :comment_button, '%strong Comment' # rubocop:disable QA/ElementWithPattern end def issue_title diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb index 228ffd9d381..5baf6439cfc 100644 --- a/qa/qa/page/project/job/show.rb +++ b/qa/qa/page/project/job/show.rb @@ -5,12 +5,12 @@ module QA::Page PASSED_STATUS = 'passed'.freeze view 'app/views/shared/builds/_build_output.html.haml' do - element :build_output, '.js-build-output' - element :loading_animation, '.js-build-refresh' + element :build_output, '.js-build-output' # rubocop:disable QA/ElementWithPattern + element :loading_animation, '.js-build-refresh' # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/vue_shared/components/ci_badge_link.vue' do - element :status_badge, 'ci-status' + element :status_badge, 'ci-status' # rubocop:disable QA/ElementWithPattern end def completed? diff --git a/qa/qa/page/project/menu.rb b/qa/qa/page/project/menu.rb index 63c719e5fe1..b32d5ea772b 100644 --- a/qa/qa/page/project/menu.rb +++ b/qa/qa/page/project/menu.rb @@ -6,26 +6,26 @@ module QA class Menu < Page::Base view 'app/views/layouts/nav/sidebar/_project.html.haml' do element :settings_item - element :settings_link, 'link_to edit_project_path' - element :repository_link, "title: _('Repository')" + element :settings_link, 'link_to edit_project_path' # rubocop:disable QA/ElementWithPattern + element :repository_link, "title: _('Repository')" # rubocop:disable QA/ElementWithPattern element :link_pipelines element :link_members_settings - element :pipelines_settings_link, "title: _('CI / CD')" - element :operations_kubernetes_link, "title: _('Kubernetes')" + element :pipelines_settings_link, "title: _('CI / CD')" # rubocop:disable QA/ElementWithPattern + element :operations_kubernetes_link, "title: _('Kubernetes')" # rubocop:disable QA/ElementWithPattern element :operations_environments_link - element :issues_link, /link_to.*shortcuts-issues/ - element :issues_link_text, "Issues" - element :merge_requests_link, /link_to.*shortcuts-merge_requests/ - element :merge_requests_link_text, "Merge Requests" - element :top_level_items, '.sidebar-top-level-items' - element :operations_section, "class: 'shortcuts-operations'" - element :activity_link, "title: _('Activity')" - element :wiki_link_text, "Wiki" + element :issues_link, /link_to.*shortcuts-issues/ # rubocop:disable QA/ElementWithPattern + element :issues_link_text, "Issues" # rubocop:disable QA/ElementWithPattern + element :merge_requests_link, /link_to.*shortcuts-merge_requests/ # rubocop:disable QA/ElementWithPattern + element :merge_requests_link_text, "Merge Requests" # rubocop:disable QA/ElementWithPattern + element :top_level_items, '.sidebar-top-level-items' # rubocop:disable QA/ElementWithPattern + element :operations_section, "class: 'shortcuts-operations'" # rubocop:disable QA/ElementWithPattern + element :activity_link, "title: _('Activity')" # rubocop:disable QA/ElementWithPattern + element :wiki_link_text, "Wiki" # rubocop:disable QA/ElementWithPattern element :milestones_link end view 'app/assets/javascripts/fly_out_nav.js' do - element :fly_out, "classList.add('fly-out-list')" + element :fly_out, "classList.add('fly-out-list')" # rubocop:disable QA/ElementWithPattern end def click_repository_settings diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb index 0766c98da6f..6acc413b586 100644 --- a/qa/qa/page/project/new.rb +++ b/qa/qa/page/project/new.rb @@ -5,21 +5,21 @@ module QA include Page::Component::Select2 view 'app/views/projects/new.html.haml' do - element :import_project_tab, "Import project" + element :import_project_tab, "Import project" # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/_new_project_fields.html.haml' do element :project_namespace_select - element :project_namespace_field, 'namespaces_options' - element :project_name, 'text_field :name' - element :project_path, 'text_field :path' - element :project_description, 'text_area :description' - element :project_create_button, "submit 'Create project'" - element :visibility_radios, 'visibility_level:' + element :project_namespace_field, 'namespaces_options' # rubocop:disable QA/ElementWithPattern + element :project_name, 'text_field :name' # rubocop:disable QA/ElementWithPattern + element :project_path, 'text_field :path' # rubocop:disable QA/ElementWithPattern + element :project_description, 'text_area :description' # rubocop:disable QA/ElementWithPattern + element :project_create_button, "submit 'Create project'" # rubocop:disable QA/ElementWithPattern + element :visibility_radios, 'visibility_level:' # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/_import_project_pane.html.haml' do - element :import_github, "icon('github', text: 'GitHub')" + element :import_github, "icon('github', text: 'GitHub')" # rubocop:disable QA/ElementWithPattern end def choose_test_namespace diff --git a/qa/qa/page/project/operations/kubernetes/add.rb b/qa/qa/page/project/operations/kubernetes/add.rb index 11ebe10fb18..18c16ca6db7 100644 --- a/qa/qa/page/project/operations/kubernetes/add.rb +++ b/qa/qa/page/project/operations/kubernetes/add.rb @@ -5,7 +5,7 @@ module QA module Kubernetes class Add < Page::Base view 'app/views/projects/clusters/new.html.haml' do - element :add_existing_cluster_button, "Add existing cluster" + element :add_existing_cluster_button, "Add existing cluster" # rubocop:disable QA/ElementWithPattern end def add_existing_cluster diff --git a/qa/qa/page/project/operations/kubernetes/add_existing.rb b/qa/qa/page/project/operations/kubernetes/add_existing.rb index 38f8527b9b4..f8e026b4405 100644 --- a/qa/qa/page/project/operations/kubernetes/add_existing.rb +++ b/qa/qa/page/project/operations/kubernetes/add_existing.rb @@ -5,11 +5,11 @@ module QA module Kubernetes class AddExisting < Page::Base view 'app/views/projects/clusters/user/_form.html.haml' do - element :cluster_name, 'text_field :name' - element :api_url, 'text_field :api_url' - element :ca_certificate, 'text_area :ca_cert' - element :token, 'text_field :token' - element :add_cluster_button, "submit s_('ClusterIntegration|Add Kubernetes cluster')" + element :cluster_name, 'text_field :name' # rubocop:disable QA/ElementWithPattern + element :api_url, 'text_field :api_url' # rubocop:disable QA/ElementWithPattern + element :ca_certificate, 'text_area :ca_cert' # rubocop:disable QA/ElementWithPattern + element :token, 'text_field :token' # rubocop:disable QA/ElementWithPattern + element :add_cluster_button, "submit s_('ClusterIntegration|Add Kubernetes cluster')" # rubocop:disable QA/ElementWithPattern element :rbac_checkbox end diff --git a/qa/qa/page/project/operations/kubernetes/index.rb b/qa/qa/page/project/operations/kubernetes/index.rb index 7261b5645da..312b459ac89 100644 --- a/qa/qa/page/project/operations/kubernetes/index.rb +++ b/qa/qa/page/project/operations/kubernetes/index.rb @@ -5,7 +5,7 @@ module QA module Kubernetes class Index < Page::Base view 'app/views/projects/clusters/_empty_state.html.haml' do - element :add_kubernetes_cluster_button, "link_to s_('ClusterIntegration|Add Kubernetes cluster')" + element :add_kubernetes_cluster_button, "link_to s_('ClusterIntegration|Add Kubernetes cluster')" # rubocop:disable QA/ElementWithPattern end def add_kubernetes_cluster diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb index e831edeb89e..9e8f9ba79d7 100644 --- a/qa/qa/page/project/operations/kubernetes/show.rb +++ b/qa/qa/page/project/operations/kubernetes/show.rb @@ -5,13 +5,13 @@ module QA module Kubernetes class Show < Page::Base view 'app/assets/javascripts/clusters/components/application_row.vue' do - element :application_row, 'js-cluster-application-row-${this.id}' - element :install_button, "s__('ClusterIntegration|Install')" - element :installed_button, "s__('ClusterIntegration|Installed')" + element :application_row, 'js-cluster-application-row-${this.id}' # rubocop:disable QA/ElementWithPattern + element :install_button, "s__('ClusterIntegration|Install')" # rubocop:disable QA/ElementWithPattern + element :installed_button, "s__('ClusterIntegration|Installed')" # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/clusters/components/applications.vue' do - element :ingress_ip_address, 'id="ingress-ip-address"' + element :ingress_ip_address, 'id="ingress-ip-address"' # rubocop:disable QA/ElementWithPattern end def install!(application_name) diff --git a/qa/qa/page/project/pipeline/index.rb b/qa/qa/page/project/pipeline/index.rb index ce430a2a6ee..19d83ecc4f4 100644 --- a/qa/qa/page/project/pipeline/index.rb +++ b/qa/qa/page/project/pipeline/index.rb @@ -2,7 +2,7 @@ module QA::Page module Project::Pipeline class Index < QA::Page::Base view 'app/assets/javascripts/pipelines/components/pipeline_url.vue' do - element :pipeline_link, 'class="js-pipeline-url-link"' + element :pipeline_link, 'class="js-pipeline-url-link"' # rubocop:disable QA/ElementWithPattern end def go_to_latest_pipeline diff --git a/qa/qa/page/project/pipeline/show.rb b/qa/qa/page/project/pipeline/show.rb index babc0079f3f..06df1238738 100644 --- a/qa/qa/page/project/pipeline/show.rb +++ b/qa/qa/page/project/pipeline/show.rb @@ -2,20 +2,20 @@ module QA::Page module Project::Pipeline class Show < QA::Page::Base view 'app/assets/javascripts/vue_shared/components/header_ci_component.vue' do - element :pipeline_header, /header class.*ci-header-container.*/ + element :pipeline_header, /header class.*ci-header-container.*/ # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/pipelines/components/graph/graph_component.vue' do - element :pipeline_graph, /class.*pipeline-graph.*/ + element :pipeline_graph, /class.*pipeline-graph.*/ # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/pipelines/components/graph/job_component.vue' do - element :job_component, /class.*ci-job-component.*/ - element :job_link, /class.*js-pipeline-graph-job-link.*/ + element :job_component, /class.*ci-job-component.*/ # rubocop:disable QA/ElementWithPattern + element :job_link, /class.*js-pipeline-graph-job-link.*/ # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/vue_shared/components/ci_icon.vue' do - element :status_icon, 'ci-status-icon-${status}' + element :status_icon, 'ci-status-icon-${status}' # rubocop:disable QA/ElementWithPattern end def running? diff --git a/qa/qa/page/project/settings/advanced.rb b/qa/qa/page/project/settings/advanced.rb index d7b2b66b587..578f097e2dc 100644 --- a/qa/qa/page/project/settings/advanced.rb +++ b/qa/qa/page/project/settings/advanced.rb @@ -4,9 +4,9 @@ module QA module Settings class Advanced < Page::Base view 'app/views/projects/edit.html.haml' do - element :project_path_field, 'text_field :path' - element :project_name_field, 'text_field :name' - element :rename_project_button, "submit 'Rename project'" + element :project_path_field, 'text_field :path' # rubocop:disable QA/ElementWithPattern + element :project_name_field, 'text_field :name' # rubocop:disable QA/ElementWithPattern + element :rename_project_button, "submit 'Rename project'" # rubocop:disable QA/ElementWithPattern end def rename_to(path) diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index 752d3d93407..cc5fc370a5a 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -12,11 +12,11 @@ module QA # rubocop:disable Naming/FileName end view 'app/views/projects/settings/ci_cd/_autodevops_form.html.haml' do - element :enable_auto_devops_field, 'check_box :enabled' - element :domain_field, 'text_field :domain' - element :enable_auto_devops_button, "%strong= s_('CICD|Default to Auto DevOps pipeline')" - element :domain_input, "%strong= _('Domain')" - element :save_changes_button, "submit _('Save changes')" + element :enable_auto_devops_field, 'check_box :enabled' # rubocop:disable QA/ElementWithPattern + element :domain_field, 'text_field :domain' # rubocop:disable QA/ElementWithPattern + element :enable_auto_devops_button, "%strong= s_('CICD|Default to Auto DevOps pipeline')" # rubocop:disable QA/ElementWithPattern + element :domain_input, "%strong= _('Domain')" # rubocop:disable QA/ElementWithPattern + element :save_changes_button, "submit _('Save changes')" # rubocop:disable QA/ElementWithPattern end def expand_runners_settings(&block) diff --git a/qa/qa/page/project/settings/common.rb b/qa/qa/page/project/settings/common.rb index 874fb381554..f3b217677f2 100644 --- a/qa/qa/page/project/settings/common.rb +++ b/qa/qa/page/project/settings/common.rb @@ -8,7 +8,7 @@ module QA def self.included(base) base.class_eval do view 'app/views/projects/edit.html.haml' do - element :advanced_settings_expand, "= expanded ? 'Collapse' : 'Expand'" + element :advanced_settings_expand, "= expanded ? 'Collapse' : 'Expand'" # rubocop:disable QA/ElementWithPattern end end end diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb index 90a0e7092bd..3c8c0cbdf7c 100644 --- a/qa/qa/page/project/settings/deploy_keys.rb +++ b/qa/qa/page/project/settings/deploy_keys.rb @@ -4,18 +4,18 @@ module QA module Settings class DeployKeys < Page::Base view 'app/views/projects/deploy_keys/_form.html.haml' do - element :deploy_key_title, 'text_field :title' - element :deploy_key_key, 'text_area :key' + element :deploy_key_title, 'text_field :title' # rubocop:disable QA/ElementWithPattern + element :deploy_key_key, 'text_area :key' # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/deploy_keys/components/app.vue' do - element :deploy_keys_section, /class=".*deploy\-keys.*"/ - element :project_deploy_keys, 'class="qa-project-deploy-keys"' + element :deploy_keys_section, /class=".*deploy\-keys.*"/ # rubocop:disable QA/ElementWithPattern + element :project_deploy_keys, 'class="qa-project-deploy-keys"' # rubocop:disable QA/ElementWithPattern end view 'app/assets/javascripts/deploy_keys/components/key.vue' do - element :key_title, /class=".*qa-key-title.*"/ - element :key_fingerprint, /class=".*qa-key-fingerprint.*"/ + element :key_title, /class=".*qa-key-title.*"/ # rubocop:disable QA/ElementWithPattern + element :key_fingerprint, /class=".*qa-key-fingerprint.*"/ # rubocop:disable QA/ElementWithPattern end def fill_key_title(title) diff --git a/qa/qa/page/project/settings/runners.rb b/qa/qa/page/project/settings/runners.rb index b41668c94cd..ac930f5385a 100644 --- a/qa/qa/page/project/settings/runners.rb +++ b/qa/qa/page/project/settings/runners.rb @@ -4,8 +4,8 @@ module QA module Settings class Runners < Page::Base view 'app/views/ci/runner/_how_to_setup_runner.html.haml' do - element :registration_token, '%code#registration_token' - element :coordinator_address, '%code#coordinator_address' + element :registration_token, '%code#registration_token' # rubocop:disable QA/ElementWithPattern + element :coordinator_address, '%code#coordinator_address' # rubocop:disable QA/ElementWithPattern end ## @@ -13,7 +13,7 @@ module QA # view 'app/helpers/runners_helper.rb' do # rubocop:disable Lint/InterpolationCheck - element :runner_status, 'runner-status-#{status}' + element :runner_status, 'runner-status-#{status}' # rubocop:disable QA/ElementWithPattern # rubocop:enable Lint/InterpolationCheck end diff --git a/qa/qa/page/project/settings/secret_variables.rb b/qa/qa/page/project/settings/secret_variables.rb index 937ae6797c8..6a87ef472e4 100644 --- a/qa/qa/page/project/settings/secret_variables.rb +++ b/qa/qa/page/project/settings/secret_variables.rb @@ -6,14 +6,14 @@ module QA include Common view 'app/views/ci/variables/_variable_row.html.haml' do - element :variable_row, '.ci-variable-row-body' - element :variable_key, '.qa-ci-variable-input-key' - element :variable_value, '.qa-ci-variable-input-value' + element :variable_row, '.ci-variable-row-body' # rubocop:disable QA/ElementWithPattern + element :variable_key, '.qa-ci-variable-input-key' # rubocop:disable QA/ElementWithPattern + element :variable_value, '.qa-ci-variable-input-value' # rubocop:disable QA/ElementWithPattern end view 'app/views/ci/variables/_index.html.haml' do - element :save_variables, '.js-secret-variables-save-button' - element :reveal_values, '.js-secret-value-reveal-button' + element :save_variables, '.js-secret-variables-save-button' # rubocop:disable QA/ElementWithPattern + element :reveal_values, '.js-secret-value-reveal-button' # rubocop:disable QA/ElementWithPattern end def fill_variable(key, value) diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb index 2e7be1deb27..fcc4bb79c10 100644 --- a/qa/qa/page/project/show.rb +++ b/qa/qa/page/project/show.rb @@ -16,7 +16,7 @@ module QA view 'app/views/layouts/header/_new_dropdown.haml' do element :new_menu_toggle - element :new_issue_link, "link_to _('New issue'), new_project_issue_path(@project)" + element :new_issue_link, "link_to _('New issue'), new_project_issue_path(@project)" # rubocop:disable QA/ElementWithPattern end view 'app/views/shared/_ref_switcher.html.haml' do @@ -25,12 +25,12 @@ module QA end view 'app/views/projects/buttons/_fork.html.haml' do - element :fork_label, "%span= s_('ProjectOverview|Fork')" - element :fork_link, "link_to new_project_fork_path(@project)" + element :fork_label, "%span= s_('ProjectOverview|Fork')" # rubocop:disable QA/ElementWithPattern + element :fork_link, "link_to new_project_fork_path(@project)" # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/_files.html.haml' do - element :tree_holder, '.tree-holder' + element :tree_holder, '.tree-holder' # rubocop:disable QA/ElementWithPattern end view 'app/views/projects/buttons/_dropdown.html.haml' do diff --git a/qa/qa/page/project/wiki/edit.rb b/qa/qa/page/project/wiki/edit.rb index 6fa45569cc0..8d0eafa1818 100644 --- a/qa/qa/page/project/wiki/edit.rb +++ b/qa/qa/page/project/wiki/edit.rb @@ -4,9 +4,9 @@ module QA module Wiki class Edit < Page::Base view 'app/views/projects/wikis/_main_links.html.haml' do - element :new_page_link, 'New page' - element :page_history_link, 'Page history' - element :edit_page_link, 'Edit' + element :new_page_link, 'New page' # rubocop:disable QA/ElementWithPattern + element :page_history_link, 'Page history' # rubocop:disable QA/ElementWithPattern + element :edit_page_link, 'Edit' # rubocop:disable QA/ElementWithPattern end def go_to_new_page diff --git a/qa/qa/page/project/wiki/new.rb b/qa/qa/page/project/wiki/new.rb index 415b3835538..2498af8600c 100644 --- a/qa/qa/page/project/wiki/new.rb +++ b/qa/qa/page/project/wiki/new.rb @@ -4,15 +4,15 @@ module QA module Wiki class New < Page::Base view 'app/views/projects/wikis/_form.html.haml' do - element :wiki_title_textbox, 'text_field :title' - element :wiki_content_textarea, "render 'projects/zen', f: f, attr: :content" - element :wiki_message_textbox, 'text_field :message' - element :save_changes_button, 'submit _("Save changes")' - element :create_page_button, 'submit s_("Wiki|Create page")' + element :wiki_title_textbox, 'text_field :title' # rubocop:disable QA/ElementWithPattern + element :wiki_content_textarea, "render 'projects/zen', f: f, attr: :content" # rubocop:disable QA/ElementWithPattern + element :wiki_message_textbox, 'text_field :message' # rubocop:disable QA/ElementWithPattern + element :save_changes_button, 'submit _("Save changes")' # rubocop:disable QA/ElementWithPattern + element :create_page_button, 'submit s_("Wiki|Create page")' # rubocop:disable QA/ElementWithPattern end view 'app/views/shared/empty_states/_wikis.html.haml' do - element :create_link, 'Create your first page' + element :create_link, 'Create your first page' # rubocop:disable QA/ElementWithPattern end def go_to_create_first_page diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb index c47a715687f..a7c4455d080 100644 --- a/qa/qa/page/project/wiki/show.rb +++ b/qa/qa/page/project/wiki/show.rb @@ -8,7 +8,7 @@ module QA include Page::Component::ClonePanel view 'app/views/projects/wikis/pages.html.haml' do - element :clone_repository_link, 'Clone repository' + element :clone_repository_link, 'Clone repository' # rubocop:disable QA/ElementWithPattern end def go_to_clone_repository diff --git a/qa/spec/page/base_spec.rb b/qa/spec/page/base_spec.rb index 52daa9697ee..076a8087db5 100644 --- a/qa/spec/page/base_spec.rb +++ b/qa/spec/page/base_spec.rb @@ -9,12 +9,12 @@ describe QA::Page::Base do subject do Class.new(described_class) do view 'path/to/some/view.html.haml' do - element :something, 'string pattern' - element :something_else, /regexp pattern/ + element :something, 'string pattern' # rubocop:disable QA/ElementWithPattern + element :something_else, /regexp pattern/ # rubocop:disable QA/ElementWithPattern end view 'path/to/some/_partial.html.haml' do - element :another_element, 'string pattern' + element :another_element, 'string pattern' # rubocop:disable QA/ElementWithPattern end end end diff --git a/qa/spec/page/view_spec.rb b/qa/spec/page/view_spec.rb index 34d2ff11447..d7b3ccd316d 100644 --- a/qa/spec/page/view_spec.rb +++ b/qa/spec/page/view_spec.rb @@ -8,8 +8,8 @@ describe QA::Page::View do describe '.evaluate' do it 'evaluates a block and returns a DSL object' do results = described_class.evaluate do - element :something, 'my pattern' - element :something_else, /another pattern/ + element :something + element :something_else end expect(results.elements.size).to eq 2 -- cgit v1.2.1