diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-17 16:23:17 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-17 16:23:17 +0200 |
commit | 25dd1712ca01d017fd3b9c2d230a62e82444b5a1 (patch) | |
tree | f1f57a64c53cd8842cb1174fe7f5eb10c0508bc9 | |
parent | 50d97527bf72829d28bb57ed01e17d921d847a11 (diff) | |
download | gitlab-ce-25dd1712ca01d017fd3b9c2d230a62e82444b5a1.tar.gz |
Add specs to test on_stop and action on environments
-rw-r--r-- | lib/gitlab/ci/config/node/environment.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/config/node/environment_spec.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/ci/config/node/environment.rb b/lib/gitlab/ci/config/node/environment.rb index b392f272bd6..9a95ef43628 100644 --- a/lib/gitlab/ci/config/node/environment.rb +++ b/lib/gitlab/ci/config/node/environment.rb @@ -64,6 +64,10 @@ module Gitlab value[:action] || 'start' end + def on_stop + value[:on_stop] + end + def value case @config when String then { name: @config, action: 'start' } diff --git a/spec/lib/gitlab/ci/config/node/environment_spec.rb b/spec/lib/gitlab/ci/config/node/environment_spec.rb index 430e18a816f..dbeb28c8aad 100644 --- a/spec/lib/gitlab/ci/config/node/environment_spec.rb +++ b/spec/lib/gitlab/ci/config/node/environment_spec.rb @@ -101,7 +101,7 @@ describe Gitlab::Ci::Config::Node::Environment do context 'when invalid action is used' do let(:config) do { name: 'production', - action: false } + action: 'invalid' } end describe '#valid?' do @@ -144,7 +144,7 @@ describe Gitlab::Ci::Config::Node::Environment do describe '#errors' do it 'contains error about invalid action' do expect(entry.errors) - .to include 'environment action should be start or stop' + .to include 'environment on stop should be a string' end end end |