Simplify coverage setting and comply to some requests in code review

3 files changed, 15 insertions, 23 deletions

diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index eb2d9c6e0e3..ac706216d5a 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -9,26 +9,17 @@ module Ci
         subject { described_class.new(config, path).build_attributes(:rspec) }
 
         let(:config_base) { { rspec: { script: "rspec" } } }
-        let(:config)      { YAML.dump(config_base) }
+        let(:config) { YAML.dump(config_base) }
 
         context 'when config has coverage set at the global scope' do
-          before do
-            config_base.update(
-              coverage: { output_filter: '\(\d+\.\d+\) covered' }
-            )
-          end
+          before { config_base.update(coverage: '\(\d+\.\d+\) covered') }
 
-          context 'and \'rspec\' job doesn\'t have coverage set' do
+          context "and 'rspec' job doesn't have coverage set" do
             it { is_expected.to include(coverage_regex: '\(\d+\.\d+\) covered') }
           end
 
           context 'but \'rspec\' job also has coverage set' do
-            before do
-              config_base[:rspec].update(
-                coverage: { output_filter: '/Code coverage: \d+\.\d+/' }
-              )
-            end
-
+            before { config_base[:rspec][:coverage] = '/Code coverage: \d+\.\d+/' }
             it { is_expected.to include(coverage_regex: 'Code coverage: \d+\.\d+') }
           end
         end
diff --git a/spec/lib/gitlab/ci/config/entry/coverage_spec.rb b/spec/lib/gitlab/ci/config/entry/coverage_spec.rb
index 9e59755d9f8..0549dbc732b 100644
--- a/spec/lib/gitlab/ci/config/entry/coverage_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/coverage_spec.rb
@@ -5,35 +5,35 @@ describe Gitlab::Ci::Config::Entry::Coverage do
 
   describe 'validations' do
     context 'when entry config value is correct' do
-      let(:config) { { output_filter: 'Code coverage: \d+\.\d+' } }
+      let(:config) { 'Code coverage: \d+\.\d+' }
 
       describe '#value' do
         subject { entry.value }
-        it      { is_expected.to eq config }
+        it { is_expected.to eq config }
       end
 
       describe '#errors' do
         subject { entry.errors }
-        it      { is_expected.to be_empty }
+        it { is_expected.to be_empty }
       end
 
       describe '#valid?' do
         subject { entry }
-        it      { is_expected.to be_valid }
+        it { is_expected.to be_valid }
       end
     end
 
     context 'when entry value is not correct' do
-      let(:config) { { output_filter: '(malformed regexp' } }
+      let(:config) { '(malformed regexp' }
 
       describe '#errors' do
         subject { entry.errors }
-        it      { is_expected.to include /coverage output filter must be a regular expression/ }
+        it { is_expected.to include /coverage config must be a regular expression/ }
       end
 
       describe '#valid?' do
         subject { entry }
-        it      { is_expected.not_to be_valid }
+        it { is_expected.not_to be_valid }
       end
     end
   end
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 9e5481017e2..7c054dd95f5 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -222,9 +222,10 @@ describe Ci::Build, :models do
   end
 
   describe '#coverage_regex' do
-    subject             { build.coverage_regex }
+    subject { build.coverage_regex }
+
     let(:project_regex) { '\(\d+\.\d+\) covered' }
-    let(:build_regex)   { 'Code coverage: \d+\.\d+' }
+    let(:build_regex) { 'Code coverage: \d+\.\d+' }
 
     context 'when project has build_coverage_regex set' do
       before { project.build_coverage_regex = project_regex }
@@ -235,7 +236,7 @@ describe Ci::Build, :models do
 
       context 'but coverage_regex attribute is also set' do
         before { build.coverage_regex = build_regex }
-        it     { is_expected.to eq(build_regex) }
+        it { is_expected.to eq(build_regex) }
       end
     end