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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8ed6e2ec
Commit
8ed6e2ec
authored
Aug 17, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test
parent
6b02c82c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
spec/views/projects/merge_requests/show.html.haml_spec.rb
spec/views/projects/merge_requests/show.html.haml_spec.rb
+6
-4
No files found.
spec/views/projects/merge_requests/show.html.haml_spec.rb
View file @
8ed6e2ec
...
@@ -3,15 +3,16 @@ require 'spec_helper'
...
@@ -3,15 +3,16 @@ require 'spec_helper'
describe
'projects/merge_requests/show.html.haml'
do
describe
'projects/merge_requests/show.html.haml'
do
include
Devise
::
TestHelpers
include
Devise
::
TestHelpers
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:unlink_project
)
{
Projects
::
UnlinkForkService
.
new
(
fork_project
,
user
)
}
let
(
:closed_merge_request
)
do
let
(
:closed_merge_request
)
do
create
(
:closed_merge_request
,
create
(
:closed_merge_request
,
source_project:
fork_project
,
source_project:
fork_project
,
source_branch:
'add-submodule-version-bump'
,
target_project:
project
,
target_branch:
'master'
,
author:
user
)
target_project:
project
)
end
end
before
do
before
do
...
@@ -31,7 +32,8 @@ describe 'projects/merge_requests/show.html.haml' do
...
@@ -31,7 +32,8 @@ describe 'projects/merge_requests/show.html.haml' do
end
end
it
'does not show the "Reopen" button when the source project does not exist'
do
it
'does not show the "Reopen" button when the source project does not exist'
do
fork_project
.
destroy
unlink_project
.
execute
closed_merge_request
.
reload
render
render
...
...
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