Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
64c9894cffd8
Commit
b720c22f
authored
Jul 31, 2017
by
Lin Jen-Shin
Browse files
Avoid expect_any_instance_of because it doesn't work
well with prepend. We need to backport this
parent
0a9ef6825249
Changes
1
Hide whitespace changes
Inline
Side-by-side
spec/services/projects/transfer_service_spec.rb
View file @
64c9894c
...
...
@@ -37,18 +37,18 @@
end
it
'executes system hooks'
do
expect_any_instance_of
(
described_class
).
to
receive
(
:execute_system_hooks
)
transfer_project
(
project
,
user
,
group
)
transfer_project
(
project
,
user
,
group
)
do
|
service
|
expect
(
service
).
to
receive
(
:execute_system_hooks
)
end
end
end
context
'when transfer fails'
do
let!
(
:original_path
)
{
project_path
(
project
)
}
def
attempt_project_transfer
def
attempt_project_transfer
(
&
block
)
expect
do
transfer_project
(
project
,
user
,
group
)
transfer_project
(
project
,
user
,
group
,
&
block
)
end
.
to
raise_error
(
ActiveRecord
::
ActiveRecordError
)
end
...
...
@@ -80,9 +80,9 @@ def current_path
end
it
"doesn't run system hooks"
do
expect_any_instance_of
(
described_class
).
not_to
receive
(
:execute_system_hooks
)
attempt_project_transfer
attempt_project_transfer
do
|
service
|
expect
(
service
).
not_to
receive
(
:execute_system_hooks
)
end
end
end
...
...
@@ -120,7 +120,11 @@ def current_path
end
def
transfer_project
(
project
,
user
,
new_namespace
)
Projects
::
TransferService
.
new
(
project
,
user
).
execute
(
new_namespace
)
service
=
Projects
::
TransferService
.
new
(
project
,
user
)
yield
(
service
)
if
block_given?
service
.
execute
(
new_namespace
)
end
context
'visibility level'
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