Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qa/qa/page/merge_request/show.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/page/merge_request/show.rb')
-rw-r--r--qa/qa/page/merge_request/show.rb177
1 files changed, 74 insertions, 103 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index e1790deb3ec..5f52d48e9f6 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -7,50 +7,16 @@ module QA
include Page::Component::Note
include Page::Component::Issuable::Sidebar
- view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do
- element :download_dropdown
- element :download_email_patches_menu_item
- element :download_plain_diff_menu_item
- element :open_in_web_ide_button
- end
-
- view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue' do
- element :merge_request_pipeline_info_content
- element :pipeline_link
- end
-
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
- element :merge_button
- element :fast_forward_message_content
- element :merge_moment_dropdown
- element :merge_immediately_menu_item
- end
-
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue' do
- element :merge_request_status_content
- end
-
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do
- element :merged_status_content
- end
-
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue' do
- element :merge_request_error_content
- 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_content
+ view 'app/assets/javascripts/batch_comments/components/preview_dropdown.vue' do
+ element :review_preview_dropdown
end
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue' do
- element :squash_checkbox
+ view 'app/assets/javascripts/batch_comments/components/publish_button.vue' do
+ element :submit_review_button
end
- view 'app/views/projects/merge_requests/show.html.haml' do
- element :notes_tab
- element :commits_tab
- element :diffs_tab
+ view 'app/assets/javascripts/batch_comments/components/review_bar.vue' do
+ element :review_bar_content
end
view 'app/assets/javascripts/diffs/components/compare_dropdown_layout.vue' do
@@ -70,33 +36,60 @@ module QA
view 'app/assets/javascripts/diffs/components/diff_row.vue' do
element :diff_comment_button
+ element :new_diff_line_link
end
- view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do
- element :new_diff_line_link
+ view 'app/assets/javascripts/notes/components/note_form.vue' do
+ element :start_review_button
+ element :comment_now_button
end
- view 'app/views/projects/merge_requests/_mr_title.html.haml' do
- element :edit_button
+ view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do
+ element :download_dropdown
+ element :download_email_patches_menu_item
+ element :download_plain_diff_menu_item
+ element :open_in_web_ide_button
end
- view 'app/assets/javascripts/batch_comments/components/publish_button.vue' do
- element :submit_review_button
+ view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue' do
+ element :merge_request_pipeline_info_content
+ element :pipeline_link
end
- view 'app/assets/javascripts/batch_comments/components/review_bar.vue' do
- element :review_bar_content
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue' do
+ element :merge_request_error_content
end
- view 'app/assets/javascripts/notes/components/note_form.vue' do
- element :unresolve_review_discussion_checkbox
- element :resolve_review_discussion_checkbox
- element :start_review_button
- element :comment_now_button
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do
+ element :cherry_pick_button
+ element :merged_status_content
+ element :revert_button
end
- view 'app/assets/javascripts/batch_comments/components/preview_dropdown.vue' do
- element :review_preview_toggle
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue' do
+ element :mr_rebase_button
+ element :no_fast_forward_message_content
+ end
+
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
+ element :merge_button
+ element :fast_forward_message_content
+ element :merge_moment_dropdown
+ element :merge_immediately_menu_item
+ end
+
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue' do
+ element :squash_checkbox
+ end
+
+ view 'app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue' do
+ element :apply_suggestion_dropdown
+ element :commit_message_field
+ element :commit_with_custom_message_button
+ end
+
+ view 'app/assets/javascripts/vue_shared/components/markdown/header.vue' do
+ element :suggestion_button
end
view 'app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue' do
@@ -104,19 +97,26 @@ module QA
element :add_suggestion_batch_button
end
- view 'app/assets/javascripts/vue_shared/components/markdown/header.vue' do
- element :suggestion_button
+ view 'app/views/projects/merge_requests/_description.html.haml' do
+ element :description_content
end
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do
- element :revert_button
- element :cherry_pick_button
+ view 'app/views/projects/merge_requests/_mr_box.html.haml' do
+ element :title_content
end
- view 'app/assets/javascripts/vue_shared/components/markdown/apply_suggestion.vue' do
- element :apply_suggestion_button
- element :commit_message_textbox
- element :commit_with_custom_message_button
+ view 'app/views/projects/merge_requests/_mr_title.html.haml' do
+ element :edit_button
+ end
+
+ view 'app/views/projects/merge_requests/show.html.haml' do
+ element :notes_tab
+ element :commits_tab
+ element :diffs_tab
+ end
+
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue' do
+ element :cancel_auto_merge_button
end
def start_review
@@ -131,21 +131,13 @@ module QA
click_element(:target_version_dropdown)
end
- def comment_now
- click_element(:comment_now_button)
-
- # After clicking the button, wait for it to disappear
- # before moving on to the next part of the test
- has_no_element?(:comment_now_button)
- end
-
def version_dropdown_content
find_element(:dropdown_content).text
end
def submit_pending_reviews
within_element(:review_bar_content) do
- click_element(:review_preview_toggle)
+ click_element(:review_preview_dropdown)
click_element(:submit_review_button)
# After clicking the button, wait for it to disappear
@@ -154,22 +146,6 @@ module QA
end
end
- def discard_pending_reviews
- within_element(:review_bar_content) do
- click_element(:discard_review)
- end
- click_element(:modal_delete_pending_comments)
- end
-
- def resolve_review_discussion
- scroll_to_element(:start_review_button)
- check_element(:resolve_review_discussion_checkbox)
- end
-
- def unresolve_review_discussion
- check_element(:unresolve_review_discussion_checkbox)
- end
-
def add_comment_to_diff(text)
wait_until(sleep_interval: 5) do
has_css?('a[data-linenumber="1"]')
@@ -230,11 +206,11 @@ module QA
end
def has_title?(title)
- has_element?(:title, text: title)
+ has_element?(:title_content, text: title)
end
def has_description?(description)
- has_element?(:description, text: description)
+ has_element?(:description_content, text: description)
end
def mark_to_squash
@@ -253,11 +229,6 @@ module QA
raise "Merge did not appear to be successful" unless merged?
end
- def merge_immediately!
- click_element(:merge_moment_dropdown)
- click_element(:merge_immediately_menu_item)
- end
-
def merge_when_pipeline_succeeds!
wait_until_ready_to_merge
@@ -281,10 +252,6 @@ module QA
has_element?(:merge_button, disabled: false)
end
- def merge_request_status
- find_element(:merge_request_status_content).text
- end
-
# Waits up 60 seconds and raises an error if unable to merge
def wait_until_ready_to_merge
has_element?(:merge_button)
@@ -363,8 +330,8 @@ module QA
end
def apply_suggestion_with_message(message)
- click_element(:apply_suggestion_button)
- fill_element(:commit_message_textbox, message)
+ click_element(:apply_suggestion_dropdown)
+ fill_element(:commit_message_field, message)
click_element(:commit_with_custom_message_button)
end
@@ -385,9 +352,13 @@ module QA
click_element(:revert_button, Page::Component::CommitModal)
click_element(:submit_commit_button)
end
+
+ def cancel_auto_merge!
+ click_element(:cancel_auto_merge_button)
+ end
end
end
end
end
-QA::Page::MergeRequest::Show.prepend_if_ee('QA::EE::Page::MergeRequest::Show')
+QA::Page::MergeRequest::Show.prepend_mod_with('Page::MergeRequest::Show', namespace: QA)
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 21:41:36 +0300