3 files changed, 71 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/config/entry/artifacts_spec.rb b/spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
index 5c31423fdee..d48aac15f28 100644
--- a/spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/artifacts_spec.rb
@@ -18,6 +18,14 @@ describe Gitlab::Ci::Config::Entry::Artifacts do
           expect(entry).to be_valid
         end
       end
+
+      context "when value includes 'reports' keyword" do
+        let(:config) { { paths: %w[public/], reports: { junit: 'junit.xml' } } }
+
+        it 'returns general artifact and report-type artifacts configuration' do
+          expect(entry.value).to eq config
+        end
+      end
     end
 
     context 'when entry value is not correct' do
@@ -39,6 +47,15 @@ describe Gitlab::Ci::Config::Entry::Artifacts do
               .to include 'artifacts config contains unknown keys: test'
           end
         end
+
+        context "when 'reports' keyword is not hash" do
+          let(:config) { { paths: %w[public/], reports: 'junit.xml' } }
+
+          it 'reports error' do
+            expect(entry.errors)
+              .to include 'artifacts reports should be a hash'
+          end
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/ci/config/entry/commands_spec.rb b/spec/lib/gitlab/ci/config/entry/commands_spec.rb
index afa4a089418..8934aeb83db 100644
--- a/spec/lib/gitlab/ci/config/entry/commands_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/commands_spec.rb
@@ -41,8 +41,7 @@ describe Gitlab::Ci::Config::Entry::Commands do
     describe '#errors' do
       it 'saves errors' do
         expect(entry.errors)
-          .to include 'commands config should be a ' \
-                      'string or an array of strings'
+          .to include 'commands config should be an array of strings or a string'
       end
     end
   end
diff --git a/spec/lib/gitlab/ci/config/entry/reports_spec.rb b/spec/lib/gitlab/ci/config/entry/reports_spec.rb
new file mode 100644
index 00000000000..b3a3a6bee1d
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/entry/reports_spec.rb
@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Config::Entry::Reports do
+  let(:entry) { described_class.new(config) }
+
+  describe 'validation' do
+    context 'when entry config value is correct' do
+      let(:config) { { junit: %w[junit.xml] } }
+
+      describe '#value' do
+        it 'returns artifacs configuration' do
+          expect(entry.value).to eq config
+        end
+      end
+
+      describe '#valid?' do
+        it 'is valid' do
+          expect(entry).to be_valid
+        end
+      end
+
+      context 'when value is not array' do
+        let(:config) { { junit: 'junit.xml' } }
+
+        it 'converts to array' do
+          expect(entry.value).to eq({ junit: ['junit.xml'] } )
+        end
+      end
+    end
+
+    context 'when entry value is not correct' do
+      describe '#errors' do
+        context 'when value of attribute is invalid' do
+          let(:config) { { junit: 10 } }
+
+          it 'reports error' do
+            expect(entry.errors)
+              .to include 'reports junit should be an array of strings or a string'
+          end
+        end
+
+        context 'when there is an unknown key present' do
+          let(:config) { { codeclimate: 'codeclimate.json' } }
+
+          it 'reports error' do
+            expect(entry.errors)
+              .to include 'reports config contains unknown keys: codeclimate'
+          end
+        end
+      end
+    end
+  end
+end