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
c1178654
Commit
c1178654
authored
Feb 03, 2020
by
nmilojevic1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix from MR discussions
- Make specs more readable - Remove momorization from after_import_service
parent
146eef9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
app/services/projects/after_import_service.rb
app/services/projects/after_import_service.rb
+2
-2
spec/services/projects/after_import_service_spec.rb
spec/services/projects/after_import_service_spec.rb
+6
-6
No files found.
app/services/projects/after_import_service.rb
View file @
c1178654
...
...
@@ -29,11 +29,11 @@ module Projects
private
def
import_failure_service
@import_failure_service
||=
Gitlab
::
ImportExport
::
ImportFailureService
.
new
(
@project
)
Gitlab
::
ImportExport
::
ImportFailureService
.
new
(
@project
)
end
def
repository
@
repository
||=
@
project
.
repository
@project
.
repository
end
end
end
spec/services/projects/after_import_service_spec.rb
View file @
c1178654
...
...
@@ -76,12 +76,12 @@ describe Projects::AfterImportService do
let
(
:exception
)
{
GRPC
::
DeadlineExceeded
.
new
}
before
do
call_count
=
0
allow
(
repository
).
to
receive
(
:delete_all_refs_except
).
and_wrap_original
do
|
original_method
,
*
args
|
call_count
+=
1
call_count
>
1
?
original_method
.
call
(
*
args
)
:
raise
(
exception
)
end
expect
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_raise
(
exception
)
expect
(
repository
)
.
to
receive
(
:delete_all_refs_except
)
.
and_call_original
subject
.
execute
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