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
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2015-12-25 19:30:48 +0300
committerJosh Frye <joshfng@gmail.com>2016-01-04 02:12:27 +0300
commitedd2ce38369e5a332b1b9932647d670862ffddbf (patch)
tree90c3ba9c3b5b23cf30570f621e7015e3d855933f /features/steps
parent796c11e9a7d955ac40c3d1f8427f3f65063ac8c4 (diff)
Change text back. Add additional tests.
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/project/fork.rb13
1 files changed, 11 insertions, 2 deletions
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index 878ddea46ff..e98bd51ca89 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -31,8 +31,8 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
end
end
- step 'I should see "New Merge Request"' do
- expect(page).to have_content "New Merge Request"
+ step 'I should see "New merge request"' do
+ expect(page).to have_content(/new merge request/i)
end
step 'I goto the Merge Requests page' do
@@ -40,4 +40,13 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
click_link "Merge Requests"
end
end
+
+ step 'I click link "New merge request"' do
+ expect(page).to have_content(/new merge request/i)
+ click_link "New Merge Request"
+ end
+
+ step 'I should see the new merge request page for my namespace' do
+ current_path.should have_content(/#{current_user.namespace.name}/i)
+ end
end