From 6f74c7d4827955d44f53eeef0701e4e3c0f718a1 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 12 Apr 2016 18:06:57 +0200
Subject: [PATCH] fix export commits stuff
---
.../projects/import_export/import_export.yml | 4 ++--
.../projects/import_export/project_tree_saver.rb | 2 +-
.../import_export/project_tree_saver_spec.rb | 15 ++++++++-------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/app/services/projects/import_export/import_export.yml b/app/services/projects/import_export/import_export.yml
index c622447ef04..92f492e9013 100644
--- a/app/services/projects/import_export/import_export.yml
+++ b/app/services/projects/import_export/import_export.yml
@@ -12,8 +12,8 @@
- :merge_requests:
- :merge_request_diff
- :notes
- - :commit_statuses:
- - :commit
+ - :ci_commits:
+ - :statuses
:attributes_only:
:project:
diff --git a/app/services/projects/import_export/project_tree_saver.rb b/app/services/projects/import_export/project_tree_saver.rb
index b2ca85bd7c6..37bf3e8e545 100644
--- a/app/services/projects/import_export/project_tree_saver.rb
+++ b/app/services/projects/import_export/project_tree_saver.rb
@@ -20,7 +20,7 @@ module Projects
File.write(full_path, project_json_tree)
true
rescue
- #TODO: handle error
+ # TODO: handle error
false
end
diff --git a/spec/services/projects/import_export/project_tree_saver_spec.rb b/spec/services/projects/import_export/project_tree_saver_spec.rb
index eda9e08cdce..05ece413410 100644
--- a/spec/services/projects/import_export/project_tree_saver_spec.rb
+++ b/spec/services/projects/import_export/project_tree_saver_spec.rb
@@ -20,9 +20,10 @@ describe Projects::ImportExport::ProjectTreeSaver, services: true do
merge_requests: [merge_request],
labels: [label],
snippets: [snippet],
- releases: [release],
- commit_statuses: [commit_status])
+ releases: [release]
+ )
end
+ let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch, statuses: [commit_status]) }
let!(:milestone) { create(:milestone, title: "Milestone v1.2", project: project) }
let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
let(:shared) { Projects::ImportExport::Shared.new(relative_path: project.path_with_namespace) }
@@ -86,10 +87,6 @@ describe Projects::ImportExport::ProjectTreeSaver, services: true do
expect(saved_project_json['issues'].first['notes']).not_to be_empty
end
- it 'has commit statuses' do
- expect(saved_project_json['commit_statuses']).not_to be_empty
- end
-
it 'has project members' do
expect(saved_project_json['project_members']).not_to be_empty
end
@@ -102,8 +99,12 @@ describe Projects::ImportExport::ProjectTreeSaver, services: true do
expect(saved_project_json['merge_requests'].first['notes']).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 commits' do
- expect(saved_project_json['commit_statuses'].first['commit']).not_to be_empty
+ expect(saved_project_json['ci_commits']).not_to be_empty
end
end
end
--
GitLab