From 2991f93f2fdd2b6de2b307ee5ba8d8ac6651f845 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Mon, 29 Aug 2016 09:30:48 +0200 Subject: [PATCH] Rename CI config hidden job entry to hidden entry --- lib/gitlab/ci/config/node/{hidden_job.rb => hidden.rb} | 2 +- lib/gitlab/ci/config/node/jobs.rb | 2 +- .../ci/config/node/{hidden_job_spec.rb => hidden_spec.rb} | 2 +- spec/lib/gitlab/ci/config/node/jobs_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename lib/gitlab/ci/config/node/{hidden_job.rb => hidden.rb} (91%) rename spec/lib/gitlab/ci/config/node/{hidden_job_spec.rb => hidden_spec.rb} (95%) diff --git a/lib/gitlab/ci/config/node/hidden_job.rb b/lib/gitlab/ci/config/node/hidden.rb similarity index 91% rename from lib/gitlab/ci/config/node/hidden_job.rb rename to lib/gitlab/ci/config/node/hidden.rb index 19514a653b0..fe4ee8a7fc6 100644 --- a/lib/gitlab/ci/config/node/hidden_job.rb +++ b/lib/gitlab/ci/config/node/hidden.rb @@ -5,7 +5,7 @@ module Gitlab ## # Entry that represents a hidden CI/CD job. # - class HiddenJob < Entry + class Hidden < Entry include Validatable validations do diff --git a/lib/gitlab/ci/config/node/jobs.rb b/lib/gitlab/ci/config/node/jobs.rb index 51683c82ceb..a1a26d4fd8f 100644 --- a/lib/gitlab/ci/config/node/jobs.rb +++ b/lib/gitlab/ci/config/node/jobs.rb @@ -30,7 +30,7 @@ module Gitlab def compose! @config.each do |name, config| - node = hidden?(name) ? Node::HiddenJob : Node::Job + node = hidden?(name) ? Node::Hidden : Node::Job factory = Node::Factory.new(node) .value(config || {}) diff --git a/spec/lib/gitlab/ci/config/node/hidden_job_spec.rb b/spec/lib/gitlab/ci/config/node/hidden_spec.rb similarity index 95% rename from spec/lib/gitlab/ci/config/node/hidden_job_spec.rb rename to spec/lib/gitlab/ci/config/node/hidden_spec.rb index ddc39405bbe..61e2a554419 100644 --- a/spec/lib/gitlab/ci/config/node/hidden_job_spec.rb +++ b/spec/lib/gitlab/ci/config/node/hidden_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::Ci::Config::Node::HiddenJob do +describe Gitlab::Ci::Config::Node::Hidden do let(:entry) { described_class.new(config) } describe 'validations' do diff --git a/spec/lib/gitlab/ci/config/node/jobs_spec.rb b/spec/lib/gitlab/ci/config/node/jobs_spec.rb index b8d9c70479c..ae2c88aac37 100644 --- a/spec/lib/gitlab/ci/config/node/jobs_spec.rb +++ b/spec/lib/gitlab/ci/config/node/jobs_spec.rb @@ -74,7 +74,7 @@ describe Gitlab::Ci::Config::Node::Jobs do expect(entry.descendants.first(2)) .to all(be_an_instance_of(Gitlab::Ci::Config::Node::Job)) expect(entry.descendants.last) - .to be_an_instance_of(Gitlab::Ci::Config::Node::HiddenJob) + .to be_an_instance_of(Gitlab::Ci::Config::Node::Hidden) end end