summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2018-10-30 14:43:25 -0400
committerMark Lapierre <mlapierre@gitlab.com>2018-10-31 11:09:06 -0400
commit8bda2af77e30ea1822ee0cbe13ff27813c7c4939 (patch)
tree5dc953a7859512dfb5040873570aa8e3906e96a2
parent116117084c22881924735e4b07509c49d19b48c7 (diff)
downloadgitlab-ce-ml-suggest-codeowners-spec-qa.tar.gz
CE changes from EE test for suggesting code ownersml-suggest-codeowners-spec-qa
Adds ability to edit a merge request and changes the MergeRequest factory so that it can accept a given file name and content EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8154
-rw-r--r--app/views/projects/merge_requests/_mr_title.html.haml2
-rw-r--r--qa/qa/factory/resource/merge_request.rb12
-rw-r--r--qa/qa/page/merge_request/show.rb10
3 files changed, 20 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index 1bf42ded97a..3cd83feb842 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -37,6 +37,6 @@
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
- if can_update_merge_request
- = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "d-none d-sm-none d-md-block btn btn-grouped js-issuable-edit"
+ = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "d-none d-sm-none d-md-block btn btn-grouped js-issuable-edit qa-edit-button"
= render 'shared/issuable/close_reopen_button', issuable: @merge_request, can_update: can_update_merge_request, can_reopen: can_update_merge_request
diff --git a/qa/qa/factory/resource/merge_request.rb b/qa/qa/factory/resource/merge_request.rb
index 4b7d2287f98..33c087858d5 100644
--- a/qa/qa/factory/resource/merge_request.rb
+++ b/qa/qa/factory/resource/merge_request.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'securerandom'
module QA
@@ -10,7 +12,9 @@ module QA
:target_branch,
:assignee,
:milestone,
- :labels
+ :labels,
+ :file_name,
+ :file_content
attribute :project do
Factory::Resource::Project.fabricate! do |resource|
@@ -34,8 +38,8 @@ module QA
resource.branch_name = target_branch
resource.remote_branch = source_branch
resource.new_branch = false
- resource.file_name = "added_file.txt"
- resource.file_content = "File Added"
+ resource.file_name = file_name
+ resource.file_content = file_content
end
end
@@ -47,6 +51,8 @@ module QA
@assignee = nil
@milestone = nil
@labels = []
+ @file_name = "added_file.txt"
+ @file_content = "File Added"
end
def fabricate!
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 376606afb5d..0cdd5db33b1 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module QA
module Page
module MergeRequest
@@ -27,6 +29,10 @@ module QA
element :labels_block
end
+ view 'app/views/projects/merge_requests/_mr_title.html.haml' do
+ element :edit_button
+ end
+
def fast_forward_possible?
!has_text?('Fast-forward merge is not possible')
end
@@ -106,6 +112,10 @@ module QA
click_element :squash_checkbox
end
+
+ def edit!
+ click_element :edit_button
+ end
end
end
end