1 files changed, 62 insertions, 48 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/workflow_spec.rb b/spec/lib/gitlab/ci/config/entry/workflow_spec.rb
index 97ac199f47d..d3ce3ffe641 100644
--- a/spec/lib/gitlab/ci/config/entry/workflow_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/workflow_spec.rb
@@ -2,13 +2,12 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Config::Entry::Workflow do
-  let(:factory) { Gitlab::Config::Entry::Factory.new(described_class).value(rules_hash) }
-  let(:config)  { factory.create! }
+RSpec.describe Gitlab::Ci::Config::Entry::Workflow, feature_category: :pipeline_composition do
+  subject(:config) { described_class.new(workflow_hash) }
 
   describe 'validations' do
     context 'when work config value is a string' do
-      let(:rules_hash) { 'build' }
+      let(:workflow_hash) { 'build' }
 
       describe '#valid?' do
         it 'is invalid' do
@@ -22,13 +21,13 @@ RSpec.describe Gitlab::Ci::Config::Entry::Workflow do
 
       describe '#value' do
         it 'returns the invalid configuration' do
-          expect(config.value).to eq(rules_hash)
+          expect(config.value).to eq(workflow_hash)
         end
       end
     end
 
     context 'when work config value is a hash' do
-      let(:rules_hash) { { rules: [{ if: '$VAR' }] } }
+      let(:workflow_hash) { { rules: [{ if: '$VAR' }] } }
 
       describe '#valid?' do
         it 'is valid' do
@@ -42,12 +41,12 @@ RSpec.describe Gitlab::Ci::Config::Entry::Workflow do
 
       describe '#value' do
         it 'returns the config' do
-          expect(config.value).to eq(rules_hash)
+          expect(config.value).to eq(workflow_hash)
         end
       end
 
       context 'with an invalid key' do
-        let(:rules_hash) { { trash: [{ if: '$VAR' }] } }
+        let(:workflow_hash) { { trash: [{ if: '$VAR' }] } }
 
         describe '#valid?' do
           it 'is invalid' do
@@ -61,64 +60,79 @@ RSpec.describe Gitlab::Ci::Config::Entry::Workflow do
 
         describe '#value' do
           it 'returns the invalid configuration' do
-            expect(config.value).to eq(rules_hash)
+            expect(config.value).to eq(workflow_hash)
           end
         end
       end
+    end
+  end
 
-      context 'with workflow name' do
-        let(:factory) { Gitlab::Config::Entry::Factory.new(described_class).value(workflow_hash) }
+  describe '.default' do
+    it 'is nil' do
+      expect(described_class.default).to be_nil
+    end
+  end
 
-        context 'with a blank name' do
-          let(:workflow_hash) do
-            { name: '' }
-          end
+  context 'with workflow name' do
+    context 'with a blank name' do
+      let(:workflow_hash) do
+        { name: '' }
+      end
 
-          it 'is invalid' do
-            expect(config).not_to be_valid
-          end
+      it 'is invalid' do
+        expect(config).not_to be_valid
+      end
 
-          it 'returns error about invalid name' do
-            expect(config.errors).to include('workflow name is too short (minimum is 1 character)')
-          end
-        end
+      it 'returns error about invalid name' do
+        expect(config.errors).to include('workflow name is too short (minimum is 1 character)')
+      end
+    end
 
-        context 'with too long name' do
-          let(:workflow_hash) do
-            { name: 'a' * 256 }
-          end
+    context 'with too long name' do
+      let(:workflow_hash) do
+        { name: 'a' * 256 }
+      end
 
-          it 'is invalid' do
-            expect(config).not_to be_valid
-          end
+      it 'is invalid' do
+        expect(config).not_to be_valid
+      end
 
-          it 'returns error about invalid name' do
-            expect(config.errors).to include('workflow name is too long (maximum is 255 characters)')
-          end
-        end
+      it 'returns error about invalid name' do
+        expect(config.errors).to include('workflow name is too long (maximum is 255 characters)')
+      end
+    end
 
-        context 'when name is nil' do
-          let(:workflow_hash) { { name: nil } }
+    context 'when name is nil' do
+      let(:workflow_hash) { { name: nil } }
 
-          it 'is valid' do
-            expect(config).to be_valid
-          end
-        end
+      it 'is valid' do
+        expect(config).to be_valid
+      end
+    end
 
-        context 'when name is not provided' do
-          let(:workflow_hash) { { rules: [{ if: '$VAR' }] } }
+    context 'when name is not provided' do
+      let(:workflow_hash) { { rules: [{ if: '$VAR' }] } }
 
-          it 'is valid' do
-            expect(config).to be_valid
-          end
-        end
+      it 'is valid' do
+        expect(config).to be_valid
       end
     end
   end
 
-  describe '.default' do
-    it 'is nil' do
-      expect(described_class.default).to be_nil
+  context 'with auto_cancel' do
+    let(:workflow_hash) do
+      {
+        auto_cancel: {
+          on_new_commit: 'interruptible',
+          on_job_failure: 'none'
+        }
+      }
+    end
+
+    it { is_expected.to be_valid }
+
+    it 'returns value correctly' do
+      expect(config.value).to eq(workflow_hash)
     end
   end
 end