Commit 069bc264 authored by James Lopez's avatar James Lopez

refactored loads of things due to commits to pipeline change

parent 771f7351
Pipeline #3505974 failed with stages
in 68128 minutes and 5 seconds
......@@ -161,6 +161,10 @@ module Ci
git_commit_message =~ /(\[ci skip\])/ if git_commit_message
end
def notes
Note.for_commit_id(sha)
end
private
def update_state
......@@ -181,9 +185,5 @@ module Ci
self.yaml_errors = error
update_state
end
def notes
Note.for_commit_id(valid_commit_sha)
end
end
end
......@@ -16,10 +16,10 @@ project_tree:
- notes:
:author
- :merge_request_diff
- ci_commits:
- :statuses
- pipelines:
- notes:
:author
- :statuses
- :variables
- :triggers
- :deploy_keys
......
......@@ -3,9 +3,8 @@ module Gitlab
class ImportExportReader
def initialize(shared:)
config = ImportExport.config_file
@shared = shared
config_hash = YAML.load_file(config).deep_symbolize_keys
config_hash = YAML.load_file(Gitlab::ImportExport.config_file).deep_symbolize_keys
@tree = config_hash[:project_tree]
@attributes_finder = Gitlab::ImportExport::AttributesFinder.new(included_attributes: config_hash[:included_attributes],
excluded_attributes: config_hash[:excluded_attributes],
......
......@@ -16,7 +16,11 @@ describe Gitlab::ImportExport::ImportExportReader, lib: true do
}
end
before do
allow_any_instance_of(Gitlab::ImportExport).to receive(:config_file).and_return(test_config)
end
it 'generates hash from project tree config' do
expect(described_class.new(config: test_config, shared: shared).project_tree).to match(project_tree_hash)
expect(described_class.new(shared: shared).project_tree).to match(project_tree_hash)
end
end
......@@ -89,20 +89,20 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true 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
it 'has pipeline statuses' do
expect(saved_project_json['pipelines'].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')
it 'has pipeline builds' do
expect(saved_project_json['pipelines'].first['statuses'].first['type']).to eq('Ci::Build')
end
it 'has ci commits' do
expect(saved_project_json['ci_commits']).not_to be_empty
it 'has pipeline commits' do
expect(saved_project_json['pipelines']).not_to be_empty
end
it 'has ci commits notes' do
expect(saved_project_json['ci_commits'].first['notes']).not_to be_empty
it 'has ci pipeline notes' do
expect(saved_project_json['pipelines'].first['notes']).not_to be_empty
end
end
end
......@@ -125,18 +125,21 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
commit_status = create(:commit_status, project: project)
ci_commit = create(:ci_commit,
ci_pipeline = create(:ci_pipeline,
project: project,
sha: merge_request.last_commit.id,
ref: merge_request.source_branch,
statuses: [commit_status])
create(:ci_build, commit: ci_commit, project: project)
create(:ci_build, pipeline: ci_pipeline, project: project)
create(:milestone, project: project)
create(:note, noteable: issue, project: project)
create(:note, noteable: merge_request, project: project)
create(:note, noteable: ci_commit, project: project)
create(:note, noteable: snippet, project: project)
create(:note_on_commit,
author: user,
project: project,
commit_id: ci_pipeline.sha)
project
end
......
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