From 4323d24abf78a33f8d53b62fe976a6b4a486de8d Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 24 Aug 2016 22:01:34 +0800
Subject: [PATCH] Remove old stuffs
---
.../data_builder/pipeline_data_builder.rb | 66 -------------------
.../pipeline_data_builder_spec.rb | 33 ----------
.../project_services/slack_service_spec.rb | 4 +-
3 files changed, 2 insertions(+), 101 deletions(-)
delete mode 100644 lib/gitlab/data_builder/pipeline_data_builder.rb
delete mode 100644 spec/lib/gitlab/data_builder/pipeline_data_builder_spec.rb
diff --git a/lib/gitlab/data_builder/pipeline_data_builder.rb b/lib/gitlab/data_builder/pipeline_data_builder.rb
deleted file mode 100644
index 13417ba09eb..00000000000
--- a/lib/gitlab/data_builder/pipeline_data_builder.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-module Gitlab
- module DataBuilder
- module PipelineDataBuilder
- module_function
-
- def build(pipeline)
- {
- object_kind: 'pipeline',
- object_attributes: hook_attrs(pipeline),
- user: pipeline.user.try(:hook_attrs),
- project: pipeline.project.hook_attrs(backward: false),
- commit: pipeline.commit.try(:hook_attrs),
- builds: pipeline.builds.map(&method(:build_hook_attrs))
- }
- end
-
- def hook_attrs(pipeline)
- first_pending_build = pipeline.builds.first_pending
- config_processor = pipeline.config_processor
-
- {
- id: pipeline.id,
- ref: pipeline.ref,
- tag: pipeline.tag,
- sha: pipeline.sha,
- before_sha: pipeline.before_sha,
- status: pipeline.status,
- stage: first_pending_build.try(:stage),
- stages: config_processor.try(:stages),
- created_at: pipeline.created_at,
- finished_at: pipeline.finished_at,
- duration: pipeline.duration
- }
- end
-
- def build_hook_attrs(build)
- {
- id: build.id,
- stage: build.stage,
- name: build.name,
- status: build.status,
- created_at: build.created_at,
- started_at: build.started_at,
- finished_at: build.finished_at,
- when: build.when,
- manual: build.manual?,
- user: build.user.try(:hook_attrs),
- runner: build.runner && runner_hook_attrs(build.runner),
- artifacts_file: {
- filename: build.artifacts_file.filename,
- size: build.artifacts_size
- }
- }
- end
-
- def runner_hook_attrs(runner)
- {
- id: runner.id,
- description: runner.description,
- active: runner.active?,
- is_shared: runner.is_shared?
- }
- end
- end
- end
-end
diff --git a/spec/lib/gitlab/data_builder/pipeline_data_builder_spec.rb b/spec/lib/gitlab/data_builder/pipeline_data_builder_spec.rb
deleted file mode 100644
index fb5d07bb563..00000000000
--- a/spec/lib/gitlab/data_builder/pipeline_data_builder_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::DataBuilder::PipelineDataBuilder do
- let(:user) { create(:user) }
- let(:project) { create(:project) }
- let!(:build) { create(:ci_build, pipeline: pipeline) }
-
- let(:pipeline) do
- create(:ci_pipeline,
- project: project, status: 'success',
- sha: project.commit.sha, ref: project.default_branch)
- end
-
- describe '.build' do
- let(:data) { Gitlab::DataBuilder::PipelineDataBuilder.build(pipeline) }
- let(:attributes) { data[:object_attributes] }
- let(:build_data) { data[:builds].first }
- let(:project_data) { data[:project] }
-
- it { expect(attributes).to be_a(Hash) }
- it { expect(attributes[:ref]).to eq(pipeline.ref) }
- it { expect(attributes[:sha]).to eq(pipeline.sha) }
- it { expect(attributes[:tag]).to eq(pipeline.tag) }
- it { expect(attributes[:id]).to eq(pipeline.id) }
- it { expect(attributes[:status]).to eq(pipeline.status) }
-
- it { expect(build_data).to be_a(Hash) }
- it { expect(build_data[:id]).to eq(build.id) }
- it { expect(build_data[:status]).to eq(build.status) }
-
- it { expect(project_data).to eq(project.hook_attrs(backward: false)) }
- end
-end
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index 9b7899270d0..975c18fee1b 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -310,7 +310,7 @@ describe SlackService, models: true do
end
it 'calls Slack API for pipeline events' do
- data = Gitlab::DataBuilder::PipelineDataBuilder.build(pipeline)
+ data = Gitlab::DataBuilder::Pipeline.build(pipeline)
slack.execute(data)
expect(WebMock).to have_requested(:post, webhook_url).once
@@ -328,7 +328,7 @@ describe SlackService, models: true do
context 'with default to notify_only_broken_pipelines' do
it 'does not call Slack API for pipeline events' do
- data = Gitlab::DataBuilder::PipelineDataBuilder.build(pipeline)
+ data = Gitlab::DataBuilder::Pipeline.build(pipeline)
result = slack.execute(data)
expect(result).to be_falsy
--
GitLab