summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-06 17:00:19 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-06 17:00:19 +0300
commitc66e5751796adc979fad684ce9b71286dd43c22f (patch)
treeee80c66ee85e6108f9f49943cff1ce3c6cbe7857 /features
parentd49b993929f21585ece74fbca3ed8ab8163f8737 (diff)
downloadgitlab-ce-c66e5751796adc979fad684ce9b71286dd43c22f.tar.gz
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/forked_merge_requests.rb2
-rw-r--r--features/steps/project/merge_requests.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 63ad90e1241..94d21d28a0c 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -46,7 +46,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
step 'I submit the merge request' do
- click_button "Submit merge request"
+ click_button "Submit new merge request"
end
step 'I follow the target commit link' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index bb1f9f129c0..12d4d81159e 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -77,7 +77,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
select "feature", from: "merge_request_target_branch"
click_button "Compare branches"
fill_in "merge_request_title", with: "Wiki Feature"
- click_button "Submit merge request"
+ click_button "Submit new merge request"
end
step 'project "Shop" have "Bug NS-04" open merge request' do