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
Léo-Paul Géneau
gitlab-ce
Commits
f77918c3
Commit
f77918c3
authored
Apr 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name
Fix overlapping test case names.
parents
4fcd89fe
de6db604
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
spec/controllers/merge_requests_controller_spec.rb
spec/controllers/merge_requests_controller_spec.rb
+3
-3
No files found.
spec/controllers/merge_requests_controller_spec.rb
View file @
f77918c3
...
@@ -12,7 +12,7 @@ describe MergeRequestsController do
...
@@ -12,7 +12,7 @@ describe MergeRequestsController do
end
end
describe
"#show"
do
describe
"#show"
do
shared_examples
"export as"
do
|
format
|
shared_examples
"export
merge
as"
do
|
format
|
it
"should generally work"
do
it
"should generally work"
do
get
:show
,
project_id:
project
.
code
,
id:
merge_request
.
id
,
format:
format
get
:show
,
project_id:
project
.
code
,
id:
merge_request
.
id
,
format:
format
...
@@ -44,7 +44,7 @@ describe MergeRequestsController do
...
@@ -44,7 +44,7 @@ describe MergeRequestsController do
end
end
describe
"as diff"
do
describe
"as diff"
do
include_examples
"export as"
,
:diff
include_examples
"export
merge
as"
,
:diff
let
(
:format
)
{
:diff
}
let
(
:format
)
{
:diff
}
it
"should really only be a git diff"
do
it
"should really only be a git diff"
do
...
@@ -55,7 +55,7 @@ describe MergeRequestsController do
...
@@ -55,7 +55,7 @@ describe MergeRequestsController do
end
end
describe
"as patch"
do
describe
"as patch"
do
include_examples
"export as"
,
:patch
include_examples
"export
merge
as"
,
:patch
let
(
:format
)
{
:patch
}
let
(
:format
)
{
:patch
}
it
"should really be a git email patch with commit"
do
it
"should really be a git email patch with commit"
do
...
...
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