summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-05-12 07:03:42 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-05-12 07:06:48 +1100
commit8a1a6bb85017969decdcf0640454bc8174a58b8c (patch)
tree2165da73ec1d76b02a5ed0067253acd339ff4e0d
parentd07979449b9cb0fbc5e3ee3680b5842dfe9895c9 (diff)
downloadgitlab-ce-blackst0ne-replace-spinach-project-forked-merge-requests.feature.tar.gz
-rw-r--r--spec/features/projects/merge_requests/user_creates_merge_request_spec.rb17
1 files changed, 7 insertions, 10 deletions
diff --git a/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb b/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
index 82dc3c36f69..1f21ef7b382 100644
--- a/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
+++ b/spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
@@ -3,6 +3,7 @@ require "spec_helper"
describe "User creates a merge request", :js do
include ProjectForksHelper
+ let(:title) { "Some feature" }
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
@@ -22,13 +23,11 @@ describe "User creates a merge request", :js do
click_button("Compare branches")
- TITLE = "Wiki Feature".freeze
-
- fill_in("Title", with: TITLE)
+ fill_in("Title", with: title)
click_button("Submit merge request")
page.within(".merge-request") do
- expect(page).to have_content(TITLE)
+ expect(page).to have_content(title)
end
end
@@ -55,18 +54,16 @@ describe "User creates a merge request", :js do
wait_for_requests
- SOURCE_BRANCH = "fix".freeze
+ source_branch = "fix"
- first(".js-source-branch-dropdown .dropdown-content a", text: SOURCE_BRANCH).click
+ first(".js-source-branch-dropdown .dropdown-content a", text: source_branch).click
click_button("Compare branches and continue")
expect(page).to have_css("h3.page-title", text: "New Merge Request")
page.within("form#new_merge_request") do
- TITLE = "Merge Request On Forked Project".freeze
-
- fill_in("Title", with: TITLE)
+ fill_in("Title", with: title)
end
click_button("Assignee")
@@ -81,7 +78,7 @@ describe "User creates a merge request", :js do
click_button("Submit merge request")
- expect(page).to have_content(TITLE).and have_content("Request to merge #{user.namespace.name}:#{SOURCE_BRANCH} into master")
+ expect(page).to have_content(title).and have_content("Request to merge #{user.namespace.name}:#{source_branch} into master")
end
end
end