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
Boxiang Sun
gitlab-ce
Commits
f2bc55d7
Commit
f2bc55d7
authored
Apr 30, 2019
by
charlieablett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove accidental regressions
parent
3d0fc7fe
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+6
-5
No files found.
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
View file @
f2bc55d7
...
...
@@ -22,12 +22,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
expect_any_instance_of
(
Gitlab
::
Git
::
Repository
).
to
receive
(
:create_branch
).
with
(
'feature'
,
'DCBA'
)
allow_any_instance_of
(
Gitlab
::
Git
::
Repository
).
to
receive
(
:create_branch
)
@
project_tree_restorer
=
described_class
.
new
(
user:
@user
,
shared:
@shared
,
project:
@project
)
project_tree_restorer
=
described_class
.
new
(
user:
@user
,
shared:
@shared
,
project:
@project
)
expect
(
Gitlab
::
ImportExport
::
RelationFactory
).
to
receive
(
:create
).
with
(
hash_including
(
excluded_keys:
[
'whatever'
])).
and_call_original
.
at_least
(
:once
)
allow
(
@
project_tree_restorer
).
to
receive
(
:excluded_keys_for_relation
).
and_return
([
'whatever'
])
allow
(
project_tree_restorer
).
to
receive
(
:excluded_keys_for_relation
).
and_return
([
'whatever'
])
@restored_project_json
=
@
project_tree_restorer
.
restore
@restored_project_json
=
project_tree_restorer
.
restore
end
end
...
...
@@ -76,6 +76,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
end
end
it
'creates a valid pipeline note'
do
expect
(
Ci
::
Pipeline
.
find_by_sha
(
'sha-notes'
).
notes
).
not_to
be_empty
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