diff options
author | James Lopez <james@jameslopez.es> | 2016-05-18 17:48:15 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-05-18 17:48:15 +0200 |
commit | a5f04ad48849b94aabeeb7450c6059e76372855c (patch) | |
tree | 921e2c97eca4e9b7b00768bd3f7ae222c9ad9cc0 /spec/lib | |
parent | 301d64b84943f7f91588c330f2d22c172f529d52 (diff) | |
download | gitlab-ce-a5f04ad48849b94aabeeb7450c6059e76372855c.tar.gz |
fixed CI commits on export
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/import_export/project_tree_saver_spec.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb index b9cf88d3f77..1c55d0e33c1 100644 --- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb @@ -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) |