Commit edd2ce38 authored by Josh Frye's avatar Josh Frye

Change text back. Add additional tests.

parent 796c11e9
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%li %li
= link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do
= icon('tasks fw') = icon('tasks fw')
New Merge Request New merge request
- if can?(current_user, :create_snippet, @project) - if can?(current_user, :create_snippet, @project)
%li %li
= link_to new_namespace_project_snippet_path(@project.namespace, @project) do = link_to new_namespace_project_snippet_path(@project.namespace, @project) do
......
...@@ -23,3 +23,5 @@ Feature: Project Fork ...@@ -23,3 +23,5 @@ Feature: Project Fork
Then I should see "New merge request" Then I should see "New merge request"
And I goto the Merge Requests page And I goto the Merge Requests page
Then I should see "New merge request" 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
...@@ -31,8 +31,8 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps ...@@ -31,8 +31,8 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
end end
end end
step 'I should see "New Merge Request"' do step 'I should see "New merge request"' do
expect(page).to have_content "New Merge Request" expect(page).to have_content(/new merge request/i)
end end
step 'I goto the Merge Requests page' do step 'I goto the Merge Requests page' do
...@@ -40,4 +40,13 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps ...@@ -40,4 +40,13 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
click_link "Merge Requests" click_link "Merge Requests"
end end
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 end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment