From 5ced2d8d7d9107f031894c5b16908db8bf6b913f Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 23 Aug 2017 15:09:20 +0200 Subject: [PATCH] Rename CI/CD job triggering policy class to Policy --- lib/gitlab/ci/config/entry/job.rb | 4 ++-- lib/gitlab/ci/config/entry/{trigger.rb => policy.rb} | 2 +- .../ci/config/entry/{trigger_spec.rb => policy_spec.rb} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename lib/gitlab/ci/config/entry/{trigger.rb => policy.rb} (91%) rename spec/lib/gitlab/ci/config/entry/{trigger_spec.rb => policy_spec.rb} (90%) diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb index 32f5c6ab142..91aac6df4b1 100644 --- a/lib/gitlab/ci/config/entry/job.rb +++ b/lib/gitlab/ci/config/entry/job.rb @@ -59,10 +59,10 @@ module Gitlab entry :services, Entry::Services, description: 'Services that will be used to execute this job.' - entry :only, Entry::Trigger, + entry :only, Entry::Policy, description: 'Refs policy this job will be executed for.' - entry :except, Entry::Trigger, + entry :except, Entry::Policy, description: 'Refs policy this job will be executed for.' entry :variables, Entry::Variables, diff --git a/lib/gitlab/ci/config/entry/trigger.rb b/lib/gitlab/ci/config/entry/policy.rb similarity index 91% rename from lib/gitlab/ci/config/entry/trigger.rb rename to lib/gitlab/ci/config/entry/policy.rb index 16b234e6c59..a08ab8a9d14 100644 --- a/lib/gitlab/ci/config/entry/trigger.rb +++ b/lib/gitlab/ci/config/entry/policy.rb @@ -5,7 +5,7 @@ module Gitlab ## # Entry that represents a trigger policy for the job. # - class Trigger < Node + class Policy < Node include Validatable validations do diff --git a/spec/lib/gitlab/ci/config/entry/trigger_spec.rb b/spec/lib/gitlab/ci/config/entry/policy_spec.rb similarity index 90% rename from spec/lib/gitlab/ci/config/entry/trigger_spec.rb rename to spec/lib/gitlab/ci/config/entry/policy_spec.rb index e4ee44f1274..ac57e3ef539 100644 --- a/spec/lib/gitlab/ci/config/entry/trigger_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/policy_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::Ci::Config::Entry::Trigger do +describe Gitlab::Ci::Config::Entry::Policy do let(:entry) { described_class.new(config) } describe 'validations' do @@ -48,7 +48,7 @@ describe Gitlab::Ci::Config::Entry::Trigger do describe '#errors' do it 'saves errors' do expect(entry.errors) - .to include 'trigger config should be an array of strings or regexps' + .to include 'policy config should be an array of strings or regexps' end end end