From edd2ce38369e5a332b1b9932647d670862ffddbf Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 25 Dec 2015 11:30:48 -0500
Subject: [PATCH] Change text back. Add additional tests.
---
app/views/projects/buttons/_dropdown.html.haml | 2 +-
features/project/fork.feature | 2 ++
features/steps/project/fork.rb | 13 +++++++++++--
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index 35a9d3223a6..f9ab78e7874 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -13,7 +13,7 @@
%li
= link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do
= icon('tasks fw')
- New Merge Request
+ New merge request
- if can?(current_user, :create_snippet, @project)
%li
= link_to new_namespace_project_snippet_path(@project.namespace, @project) do
diff --git a/features/project/fork.feature b/features/project/fork.feature
index 1182f493e34..37cd53ee977 100644
--- a/features/project/fork.feature
+++ b/features/project/fork.feature
@@ -23,3 +23,5 @@ Feature: Project Fork
Then I should see "New merge request"
And I goto the Merge Requests page
Then I should see "New merge request"
+ And I click link "New merge request"
+ Then I should see the new merge request page for my namespace
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
--
GitLab