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
46fef6f2
Commit
46fef6f2
authored
Jul 22, 2019
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport import/export spec changes from EE
This backports remaining import/export spec changes from EE to CE.
parent
7e2e48cf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+6
-1
spec/lib/gitlab/import_export/relation_rename_service_spec.rb
.../lib/gitlab/import_export/relation_rename_service_spec.rb
+1
-0
No files found.
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
View file @
46fef6f2
...
@@ -42,6 +42,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
...
@@ -42,6 +42,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
expect
(
saved_project_json
).
to
include
({
'description'
=>
'description'
,
'visibility_level'
=>
20
})
expect
(
saved_project_json
).
to
include
({
'description'
=>
'description'
,
'visibility_level'
=>
20
})
end
end
it
'has approvals_before_merge set'
do
expect
(
saved_project_json
[
'approvals_before_merge'
]).
to
eq
(
1
)
end
it
'has milestones'
do
it
'has milestones'
do
expect
(
saved_project_json
[
'milestones'
]).
not_to
be_empty
expect
(
saved_project_json
[
'milestones'
]).
not_to
be_empty
end
end
...
@@ -287,7 +291,8 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
...
@@ -287,7 +291,8 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
issues:
[
issue
],
issues:
[
issue
],
snippets:
[
snippet
],
snippets:
[
snippet
],
releases:
[
release
],
releases:
[
release
],
group:
group
group:
group
,
approvals_before_merge:
1
)
)
project_label
=
create
(
:label
,
project:
project
)
project_label
=
create
(
:label
,
project:
project
)
group_label
=
create
(
:group_label
,
group:
group
)
group_label
=
create
(
:group_label
,
group:
group
)
...
...
spec/lib/gitlab/import_export/relation_rename_service_spec.rb
View file @
46fef6f2
...
@@ -28,6 +28,7 @@ describe Gitlab::ImportExport::RelationRenameService do
...
@@ -28,6 +28,7 @@ describe Gitlab::ImportExport::RelationRenameService do
before
do
before
do
allow
(
shared
).
to
receive
(
:export_path
).
and_return
(
import_path
)
allow
(
shared
).
to
receive
(
:export_path
).
and_return
(
import_path
)
allow
(
ActiveSupport
::
JSON
).
to
receive
(
:decode
).
and_call_original
allow
(
ActiveSupport
::
JSON
).
to
receive
(
:decode
).
with
(
file_content
).
and_return
(
json_file
)
allow
(
ActiveSupport
::
JSON
).
to
receive
(
:decode
).
with
(
file_content
).
and_return
(
json_file
)
end
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