Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
edd2ce38
Commit
edd2ce38
authored
Dec 25, 2015
by
Josh Frye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change text back. Add additional tests.
parent
796c11e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
app/views/projects/buttons/_dropdown.html.haml
app/views/projects/buttons/_dropdown.html.haml
+1
-1
features/project/fork.feature
features/project/fork.feature
+2
-0
features/steps/project/fork.rb
features/steps/project/fork.rb
+11
-2
No files found.
app/views/projects/buttons/_dropdown.html.haml
View file @
edd2ce38
...
...
@@ -13,7 +13,7 @@
%li
=
link_to
new_namespace_project_merge_request_path
(
merge_project
.
namespace
,
merge_project
)
do
=
icon
(
'tasks fw'
)
New
Merge R
equest
New
merge r
equest
-
if
can?
(
current_user
,
:create_snippet
,
@project
)
%li
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
)
do
...
...
features/project/fork.feature
View file @
edd2ce38
...
...
@@ -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
features/steps/project/fork.rb
View file @
edd2ce38
...
...
@@ -31,8 +31,8 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
end
end
step
'I should see "New
Merge R
equest"'
do
expect
(
page
).
to
have_content
"New Merge Request"
step
'I should see "New
merge r
equest"'
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment