diff --git a/app/assets/javascripts/projects/settings/components/default_branch_selector.vue b/app/assets/javascripts/projects/settings/components/default_branch_selector.vue index fee2f5912167ac347f45774b9ab563cad2276e7e..f5fb72e84bc5157676836578e9cb00690f5217d5 100644 --- a/app/assets/javascripts/projects/settings/components/default_branch_selector.vue +++ b/app/assets/javascripts/projects/settings/components/default_branch_selector.vue @@ -33,6 +33,5 @@ export default { :translations="$options.i18n" name="project[default_branch]" data-testid="default-branch-dropdown" - data-qa-selector="default_branch_dropdown" /> </template> diff --git a/app/views/projects/branch_defaults/_show.html.haml b/app/views/projects/branch_defaults/_show.html.haml index 5906cd34c17ef1699e02cdf2f470c77f6caa67bb..521d5bb989085b5929fee223bed2e2aca070d2b1 100644 --- a/app/views/projects/branch_defaults/_show.html.haml +++ b/app/views/projects/branch_defaults/_show.html.haml @@ -14,4 +14,4 @@ %input{ name: 'update_section', type: 'hidden', value: 'js-issue-settings' } = render 'projects/branch_defaults/default_branch_fields', f: f = render 'projects/branch_defaults/branch_names_fields', f: f - = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' } + = f.submit _('Save changes'), pajamas_button: true diff --git a/qa/qa/page/project/settings/default_branch.rb b/qa/qa/page/project/settings/default_branch.rb deleted file mode 100644 index a59158966c1c74a70bdc60022339084adf3d9aa9..0000000000000000000000000000000000000000 --- a/qa/qa/page/project/settings/default_branch.rb +++ /dev/null @@ -1,32 +0,0 @@ -# frozen_string_literal: true - -module QA - module Page - module Project - module Settings - class DefaultBranch < Page::Base - include ::QA::Page::Component::Dropdown - - view 'app/views/projects/branch_defaults/_show.html.haml' do - element :save_changes_button - end - - view 'app/assets/javascripts/projects/settings/components/default_branch_selector.vue' do - element :default_branch_dropdown - end - - def set_default_branch(branch) - expand_select_list - search_and_select(branch) - end - - def click_save_changes_button - find('.btn-confirm').click - end - end - end - end - end -end - -QA::Page::Project::Settings::DefaultBranch.prepend_mod_with('Page::Project::Settings::DefaultBranch', namespace: QA) diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb index c8ac01e98f82723233465eb264c8f246330ce23f..a5871f6cd50dfe6e546ddf8b90b82d5799a2307e 100644 --- a/qa/qa/page/project/settings/repository.rb +++ b/qa/qa/page/project/settings/repository.rb @@ -64,14 +64,6 @@ def expand_protected_tags(&block) def expand_branch_rules expand_content('branch-rules-content') end - - def expand_default_branch(&block) - within('#branch-defaults-settings') do - find('.btn-default').click do - DefaultBranch.perform(&block) - end - end - end end end end