From 78b2f65cb5320a6a28c1e26bb6ee792a54e1b674 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 1 Jun 2017 12:00:37 +0200 Subject: [PATCH] Rename `Ci::Stage` class to `Ci::LegacyStage` --- app/models/ci/{stage.rb => legacy_stage.rb} | 2 +- app/models/ci/pipeline.rb | 4 ++-- spec/factories/ci/stages.rb | 6 ++++-- spec/models/ci/{stage_spec.rb => legacy_stage_spec.rb} | 2 +- spec/models/ci/pipeline_spec.rb | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) rename app/models/ci/{stage.rb => legacy_stage.rb} (98%) rename spec/models/ci/{stage_spec.rb => legacy_stage_spec.rb} (99%) diff --git a/app/models/ci/stage.rb b/app/models/ci/legacy_stage.rb similarity index 98% rename from app/models/ci/stage.rb rename to app/models/ci/legacy_stage.rb index 9bda3186c30..9b536af672b 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/legacy_stage.rb @@ -1,7 +1,7 @@ module Ci # Currently this is artificial object, constructed dynamically # We should migrate this object to actual database record in the future - class Stage + class LegacyStage include StaticModel attr_reader :pipeline, :name diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 8e687fd5c08..e64e16657fe 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -161,7 +161,7 @@ module Ci end def legacy_stage(name) - stage = Ci::Stage.new(self, name: name) + stage = Ci::LegacyStage.new(self, name: name) stage unless stage.statuses_count.zero? end @@ -180,7 +180,7 @@ module Ci .pluck('sg.stage', status_sql, "(#{warnings_sql})") stages_with_statuses.map do |stage| - Ci::Stage.new(self, Hash[%i[name status warnings].zip(stage)]) + Ci::LegacyStage.new(self, Hash[%i[name status warnings].zip(stage)]) end end diff --git a/spec/factories/ci/stages.rb b/spec/factories/ci/stages.rb index 7f557b25ccb..884661e1030 100644 --- a/spec/factories/ci/stages.rb +++ b/spec/factories/ci/stages.rb @@ -1,5 +1,5 @@ FactoryGirl.define do - factory :ci_stage, class: Ci::Stage do + factory :ci_stage, class: Ci::LegacyStage do transient do name 'test' status nil @@ -8,7 +8,9 @@ FactoryGirl.define do end initialize_with do - Ci::Stage.new(pipeline, name: name, status: status, warnings: warnings) + Ci::LegacyStage.new(pipeline, name: name, + status: status, + warnings: warnings) end end end diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/legacy_stage_spec.rb similarity index 99% rename from spec/models/ci/stage_spec.rb rename to spec/models/ci/legacy_stage_spec.rb index 8f6ab908987..48116c7e701 100644 --- a/spec/models/ci/stage_spec.rb +++ b/spec/models/ci/legacy_stage_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Ci::Stage, models: true do +describe Ci::LegacyStage, :models do let(:stage) { build(:ci_stage) } let(:pipeline) { stage.pipeline } let(:stage_name) { stage.name } diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 46dfa90218d..17e10a5322e 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -292,7 +292,7 @@ describe Ci::Pipeline, models: true do create(:commit_status, pipeline: pipeline, stage: 'test') end - it { expect(subject).to be_a Ci::Stage } + it { expect(subject).to be_a Ci::LegacyStage } it { expect(subject.name).to eq 'test' } it { expect(subject.statuses).not_to be_empty } end