diff options
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 5 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 7de99a11cf6..22bcad5994a 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -93,7 +93,6 @@ module QA end view 'app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue' do - element :apply_suggestions_batch_button element :add_suggestion_batch_button end @@ -353,10 +352,6 @@ module QA all_elements(:add_suggestion_batch_button, minimum: 1).first.click end - def apply_suggestions_batch - all_elements(:apply_suggestions_batch_button, minimum: 1).first.click - end - def cherry_pick! click_element(:cherry_pick_button, Page::Component::CommitModal) click_element(:submit_commit_button) diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb index 5cebbb32ade..20d312b43c0 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb @@ -50,7 +50,7 @@ module QA Page::MergeRequest::Show.perform do |merge_request| merge_request.click_diffs_tab 4.times { merge_request.add_suggestion_to_batch } - merge_request.apply_suggestions_batch + merge_request.apply_suggestion_with_message("Custom commit message") expect(merge_request).to have_css('.badge-success', text: "Applied", count: 4) end |