diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-08 13:22:39 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-08 13:22:39 +0200 |
commit | 48a59c1a8baf3921f26c8503a9fdd63bf7398f0f (patch) | |
tree | 0599a27f56ce7e81b68ae9a907250169f6d0b019 | |
parent | 5065612a0a1a5dd68c075e54f5f5f89c5c025a6b (diff) | |
download | gitlab-ce-48a59c1a8baf3921f26c8503a9fdd63bf7398f0f.tar.gz |
Rename BeforeScript to Script in new Ci config
-rw-r--r-- | lib/gitlab/ci/config/node/global.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/config/node/script.rb (renamed from lib/gitlab/ci/config/node/before_script.rb) | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/config/node/global_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/config/node/script_spec.rb (renamed from spec/lib/gitlab/ci/config/node/before_script_spec.rb) | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/ci/config/node/global.rb b/lib/gitlab/ci/config/node/global.rb index cfa506c28b7..2e899b0b2a3 100644 --- a/lib/gitlab/ci/config/node/global.rb +++ b/lib/gitlab/ci/config/node/global.rb @@ -3,7 +3,7 @@ module Gitlab class Config module Node class Global < Entry - add_node :before_script, BeforeScript + add_node :before_script, Script end end end diff --git a/lib/gitlab/ci/config/node/before_script.rb b/lib/gitlab/ci/config/node/script.rb index be2ceebf3f9..db635f6541f 100644 --- a/lib/gitlab/ci/config/node/before_script.rb +++ b/lib/gitlab/ci/config/node/script.rb @@ -2,7 +2,7 @@ module Gitlab module Ci class Config module Node - class BeforeScript < Entry + class Script < Entry include ValidationHelpers def description diff --git a/spec/lib/gitlab/ci/config/node/global_spec.rb b/spec/lib/gitlab/ci/config/node/global_spec.rb index 74a64c6df98..ecfd60b2736 100644 --- a/spec/lib/gitlab/ci/config/node/global_spec.rb +++ b/spec/lib/gitlab/ci/config/node/global_spec.rb @@ -31,7 +31,7 @@ describe Gitlab::Ci::Config::Node::Global do it 'creates node object using valid class' do expect(global.nodes.first) - .to be_an_instance_of Gitlab::Ci::Config::Node::BeforeScript + .to be_an_instance_of Gitlab::Ci::Config::Node::Script end end diff --git a/spec/lib/gitlab/ci/config/node/before_script_spec.rb b/spec/lib/gitlab/ci/config/node/script_spec.rb index b506b9743c6..0af97bab164 100644 --- a/spec/lib/gitlab/ci/config/node/before_script_spec.rb +++ b/spec/lib/gitlab/ci/config/node/script_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::Ci::Config::Node::BeforeScript do +describe Gitlab::Ci::Config::Node::Script do let(:entry) { described_class.new(value, double)} before { entry.validate! } |