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
bef1292c
Commit
bef1292c
authored
Sep 13, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix not working test with execute
parent
0437842d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+4
-4
No files found.
spec/models/merge_request_spec.rb
View file @
bef1292c
...
...
@@ -1041,8 +1041,8 @@ describe MergeRequest, models: true do
describe
'#closed_without_source_project?'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
,
namespace:
user
.
namespace
)
}
let
(
:destroy_project
)
{
Projects
::
DestroyService
.
new
(
fork_project
,
user
,
{})
}
context
'when the merge request is closed'
do
...
...
@@ -1057,7 +1057,7 @@ describe MergeRequest, models: true do
end
it
'returns true if the source project does not exist'
do
destroy_project
.
async_
execute
destroy_project
.
execute
closed_merge_request
.
reload
expect
(
closed_merge_request
.
closed_without_source_project?
).
to
be_truthy
...
...
@@ -1081,8 +1081,8 @@ describe MergeRequest, models: true do
context
'forked project'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
,
namespace:
user
.
namespace
)
}
let
(
:merge_request
)
do
create
(
:closed_merge_request
,
source_project:
fork_project
,
...
...
@@ -1096,7 +1096,7 @@ describe MergeRequest, models: true do
end
it
'returns false if the source project is deleted'
do
Projects
::
DestroyService
.
new
(
fork_project
,
user
,
{}).
async_
execute
Projects
::
DestroyService
.
new
(
fork_project
,
user
,
{}).
execute
expect
(
merge_request
.
reload
.
can_reopen?
).
to
be_falsey
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