Commit 08f23751 authored by James Lopez's avatar James Lopez

Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
parents 2b0d198d a5f04ad4
......@@ -2,9 +2,10 @@ module Gitlab
module ImportExport
class AttributesFinder
def initialize(included_attributes:, excluded_attributes:)
def initialize(included_attributes:, excluded_attributes:, methods:)
@included_attributes = included_attributes || {}
@excluded_attributes = excluded_attributes || {}
@methods = methods || {}
end
def find(model_object)
......@@ -27,10 +28,15 @@ module Gitlab
@excluded_attributes[key].nil? ? {} : { except: @excluded_attributes[key] }
end
def find_method(value)
key = key_from_hash(value)
@methods[key].nil? ? {} : { methods: @methods[key] }
end
private
def find_attributes_only(value)
find_included(value).merge(find_excluded(value))
find_included(value).merge(find_excluded(value)).merge(find_method(value))
end
def key_from_hash(value)
......
......@@ -45,4 +45,8 @@ included_attributes:
# Do not include the following attributes for the models specified.
excluded_attributes:
snippets:
- :expired_at
\ No newline at end of file
- :expired_at
methods:
statuses:
- :type
\ No newline at end of file
......@@ -9,7 +9,8 @@ module Gitlab
config_hash = YAML.load_file(config).deep_symbolize_keys
@tree = config_hash[:project_tree]
@attributes_parser = Gitlab::ImportExport::AttributesFinder.new(included_attributes: config_hash[:included_attributes],
excluded_attributes: config_hash[:excluded_attributes])
excluded_attributes: config_hash[:excluded_attributes],
methods: config_hash[:methods])
end
def project_tree
......
......@@ -84,10 +84,15 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
it 'has author on merge requests comments' do
expect(saved_project_json['merge_requests'].first['notes'].first['author']).not_to be_empty
end
it 'has commit statuses' do
expect(saved_project_json['ci_commits'].first['statuses']).not_to be_empty
end
it 'has CI builds' do
expect(saved_project_json['ci_commits'].first['statuses'].first['type']).to eq('Ci::Build')
end
it 'has ci commits' do
expect(saved_project_json['ci_commits']).not_to be_empty
end
......@@ -99,7 +104,6 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
merge_request = create(:merge_request)
label = create(:label)
snippet = create(:project_snippet)
commit_status = create(:commit_status)
release = create(:release)
project = create(:project,
......@@ -111,7 +115,8 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
releases: [release]
)
create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch, statuses: [commit_status])
ci_commit = create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch)
create(:ci_build, commit: ci_commit)
create(:milestone, project: project)
create(:note, noteable: issue)
create(:note, noteable: merge_request)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment