Merge branch 'fix-failing-tests' into pipeline-hooks-without-slack

12 files changed, 436 insertions, 84 deletions

diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index 0239aea47fb..602de72d23f 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -7,12 +7,13 @@ describe Admin::GroupsController do
 
   before do
     sign_in(admin)
-    Sidekiq::Testing.fake!
   end
 
   describe 'DELETE #destroy' do
     it 'schedules a group destroy' do
-      expect { delete :destroy, id: project.group.path }.to change(GroupDestroyWorker.jobs, :size).by(1)
+      Sidekiq::Testing.fake! do
+        expect { delete :destroy, id: project.group.path }.to change(GroupDestroyWorker.jobs, :size).by(1)
+      end
     end
 
     it 'redirects to the admin group path' do
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 4ae6364207b..a763e2c5ba8 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -89,12 +89,13 @@ describe GroupsController do
 
     context 'as the group owner' do
       before do
-        Sidekiq::Testing.fake!
         sign_in(user)
       end
 
       it 'schedules a group destroy' do
-        expect { delete :destroy, id: group.path }.to change(GroupDestroyWorker.jobs, :size).by(1)
+        Sidekiq::Testing.fake! do
+          expect { delete :destroy, id: group.path }.to change(GroupDestroyWorker.jobs, :size).by(1)
+        end
       end
 
       it 'redirects to the root path' do
diff --git a/spec/features/projects/badges/coverage_spec.rb b/spec/features/projects/badges/coverage_spec.rb
new file mode 100644
index 00000000000..af86d3c338a
--- /dev/null
+++ b/spec/features/projects/badges/coverage_spec.rb
@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+feature 'test coverage badge' do
+  given!(:user) { create(:user) }
+  given!(:project) { create(:project, :private) }
+
+  given!(:pipeline) do
+    create(:ci_pipeline, project: project,
+                         ref: 'master',
+                         sha: project.commit.id)
+  end
+
+  context 'when user has access to view badge' do
+    background do
+      project.team << [user, :developer]
+      login_as(user)
+    end
+
+    scenario 'user requests coverage badge image for pipeline' do
+      create_job(coverage: 100, name: 'test:1')
+      create_job(coverage: 90, name: 'test:2')
+
+      show_test_coverage_badge
+
+      expect_coverage_badge('95%')
+    end
+
+    scenario 'user requests coverage badge for specific job' do
+      create_job(coverage: 50, name: 'test:1')
+      create_job(coverage: 50, name: 'test:2')
+      create_job(coverage: 85, name: 'coverage')
+
+      show_test_coverage_badge(job: 'coverage')
+
+      expect_coverage_badge('85%')
+    end
+
+    scenario 'user requests coverage badge for pipeline without coverage' do
+      create_job(coverage: nil, name: 'test')
+
+      show_test_coverage_badge
+
+      expect_coverage_badge('unknown')
+    end
+  end
+
+  context 'when user does not have access to view badge' do
+    background { login_as(user) }
+
+    scenario 'user requests test coverage badge image' do
+      show_test_coverage_badge
+
+      expect(page).to have_http_status(404)
+    end
+  end
+
+  def create_job(coverage:, name:)
+    create(:ci_build, name: name,
+                      coverage: coverage,
+                      pipeline: pipeline)
+  end
+
+  def show_test_coverage_badge(job: nil)
+    visit coverage_namespace_project_badges_path(
+      project.namespace, project, ref: :master, job: job, format: :svg)
+  end
+
+  def expect_coverage_badge(coverage)
+    svg = Nokogiri::XML.parse(page.body)
+    expect(page.response_headers['Content-Type']).to include('image/svg+xml')
+    expect(svg.at(%Q{text:contains("#{coverage}")})).to be_truthy
+  end
+end
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb
index 75166bca119..67a4a5d1ab1 100644
--- a/spec/features/projects/badges/list_spec.rb
+++ b/spec/features/projects/badges/list_spec.rb
@@ -9,25 +9,43 @@ feature 'list of badges' do
     visit namespace_project_pipelines_settings_path(project.namespace, project)
   end
 
-  scenario 'user displays list of badges' do
-    expect(page).to have_content 'build status'
-    expect(page).to have_content 'Markdown'
-    expect(page).to have_content 'HTML'
-    expect(page).to have_css('.highlight', count: 2)
-    expect(page).to have_xpath("//img[@alt='build status']")
-
-    page.within('.highlight', match: :first) do
-      expect(page).to have_content 'badges/master/build.svg'
+  scenario 'user wants to see build status badge' do
+    page.within('.build-status') do
+      expect(page).to have_content 'build status'
+      expect(page).to have_content 'Markdown'
+      expect(page).to have_content 'HTML'
+      expect(page).to have_css('.highlight', count: 2)
+      expect(page).to have_xpath("//img[@alt='build status']")
+
+      page.within('.highlight', match: :first) do
+        expect(page).to have_content 'badges/master/build.svg'
+      end
     end
   end
 
-  scenario 'user changes current ref on badges list page', js: true do
-    first('.js-project-refs-dropdown').click
+  scenario 'user wants to see coverage report badge' do
+    page.within('.coverage-report') do
+      expect(page).to have_content 'coverage report'
+      expect(page).to have_content 'Markdown'
+      expect(page).to have_content 'HTML'
+      expect(page).to have_css('.highlight', count: 2)
+      expect(page).to have_xpath("//img[@alt='coverage report']")
 
-    page.within '.project-refs-form' do
-      click_link 'improve/awesome'
+      page.within('.highlight', match: :first) do
+        expect(page).to have_content 'badges/master/coverage.svg'
+      end
     end
+  end
+
+  scenario 'user changes current ref of build status badge', js: true do
+    page.within('.build-status') do
+      first('.js-project-refs-dropdown').click
 
-    expect(page).to have_content 'badges/improve/awesome/build.svg'
+      page.within '.project-refs-form' do
+        click_link 'improve/awesome'
+      end
+
+      expect(page).to have_content 'badges/improve/awesome/build.svg'
+    end
   end
 end
diff --git a/spec/lib/gitlab/badge/build/metadata_spec.rb b/spec/lib/gitlab/badge/build/metadata_spec.rb
index ad5388215c2..d678e522721 100644
--- a/spec/lib/gitlab/badge/build/metadata_spec.rb
+++ b/spec/lib/gitlab/badge/build/metadata_spec.rb
@@ -1,37 +1,27 @@
 require 'spec_helper'
+require 'lib/gitlab/badge/shared/metadata'
 
 describe Gitlab::Badge::Build::Metadata do
-  let(:project) { create(:project) }
-  let(:branch) { 'master' }
-  let(:badge) { described_class.new(project, branch) }
+  let(:badge) { double(project: create(:project), ref: 'feature') }
+  let(:metadata) { described_class.new(badge) }
 
-  describe '#to_html' do
-    let(:html) { Nokogiri::HTML.parse(badge.to_html) }
-    let(:a_href) { html.at('a') }
+  it_behaves_like 'badge metadata'
 
-    it 'points to link' do
-      expect(a_href[:href]).to eq badge.link_url
-    end
-
-    it 'contains clickable image' do
-      expect(a_href.children.first.name).to eq 'img'
+  describe '#title' do
+    it 'returns build status title' do
+      expect(metadata.title).to eq 'build status'
     end
   end
 
-  describe '#to_markdown' do
-    subject { badge.to_markdown }
-
-    it { is_expected.to include badge.image_url }
-    it { is_expected.to include badge.link_url }
-  end
-
   describe '#image_url' do
-    subject { badge.image_url }
-    it { is_expected.to include "badges/#{branch}/build.svg" }
+    it 'returns valid url' do
+      expect(metadata.image_url).to include 'badges/feature/build.svg'
+    end
   end
 
   describe '#link_url' do
-    subject { badge.link_url }
-    it { is_expected.to include "commits/#{branch}" }
+    it 'returns valid link' do
+      expect(metadata.link_url).to include 'commits/feature'
+    end
   end
 end
diff --git a/spec/lib/gitlab/badge/build_spec.rb b/spec/lib/gitlab/badge/build/status_spec.rb
index bb8144d5122..38eebb2a176 100644
--- a/spec/lib/gitlab/badge/build_spec.rb
+++ b/spec/lib/gitlab/badge/build/status_spec.rb
@@ -1,11 +1,23 @@
 require 'spec_helper'
 
-describe Gitlab::Badge::Build do
+describe Gitlab::Badge::Build::Status do
   let(:project) { create(:project) }
   let(:sha) { project.commit.sha }
   let(:branch) { 'master' }
   let(:badge) { described_class.new(project, branch) }
 
+  describe '#entity' do
+    it 'always says build' do
+      expect(badge.entity).to eq 'build'
+    end
+  end
+
+  describe '#template' do
+    it 'returns badge template' do
+      expect(badge.template.key_text).to eq 'build'
+    end
+  end
+
   describe '#metadata' do
     it 'returns badge metadata' do
       expect(badge.metadata.image_url)
@@ -13,12 +25,6 @@ describe Gitlab::Badge::Build do
     end
   end
 
-  describe '#key_text' do
-    it 'always says build' do
-      expect(badge.key_text).to eq 'build'
-    end
-  end
-
   context 'build exists' do
     let!(:build) { create_build(project, sha, branch) }
 
@@ -30,12 +36,6 @@ describe Gitlab::Badge::Build do
           expect(badge.status).to eq 'success'
         end
       end
-
-      describe '#value_text' do
-        it 'returns correct value text' do
-          expect(badge.value_text).to eq 'success'
-        end
-      end
     end
 
     context 'build failed' do
@@ -46,12 +46,6 @@ describe Gitlab::Badge::Build do
           expect(badge.status).to eq 'failed'
         end
       end
-
-      describe '#value_text' do
-        it 'has correct value text' do
-          expect(badge.value_text).to eq 'failed'
-        end
-      end
     end
 
     context 'when outdated pipeline for given ref exists' do
@@ -87,12 +81,6 @@ describe Gitlab::Badge::Build do
         expect(badge.status).to eq 'unknown'
       end
     end
-
-    describe '#value_text' do
-      it 'has correct value text' do
-        expect(badge.value_text).to eq 'unknown'
-      end
-    end
   end
 
   def create_build(project, sha, branch)
diff --git a/spec/lib/gitlab/badge/build/template_spec.rb b/spec/lib/gitlab/badge/build/template_spec.rb
index 86dead3c54e..a7e21fb8bb1 100644
--- a/spec/lib/gitlab/badge/build/template_spec.rb
+++ b/spec/lib/gitlab/badge/build/template_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::Badge::Build::Template do
-  let(:status) { 'success' }
-  let(:template) { described_class.new(status) }
+  let(:badge) { double(entity: 'build', status: 'success') }
+  let(:template) { described_class.new(badge) }
 
   describe '#key_text' do
     it 'is always says build' do
@@ -34,15 +34,15 @@ describe Gitlab::Badge::Build::Template do
 
   describe '#value_color' do
     context 'when status is success' do
-      let(:status) { 'success' }
-
       it 'has expected color' do
         expect(template.value_color).to eq '#4c1'
       end
     end
 
     context 'when status is failed' do
-      let(:status) { 'failed' }
+      before do
+        allow(badge).to receive(:status).and_return('failed')
+      end
 
       it 'has expected color' do
         expect(template.value_color).to eq '#e05d44'
@@ -50,7 +50,9 @@ describe Gitlab::Badge::Build::Template do
     end
 
     context 'when status is running' do
-      let(:status) { 'running' }
+      before do
+        allow(badge).to receive(:status).and_return('running')
+      end
 
       it 'has expected color' do
         expect(template.value_color).to eq '#dfb317'
@@ -58,7 +60,9 @@ describe Gitlab::Badge::Build::Template do
     end
 
     context 'when status is unknown' do
-      let(:status) { 'unknown' }
+      before do
+        allow(badge).to receive(:status).and_return('unknown')
+      end
 
       it 'has expected color' do
         expect(template.value_color).to eq '#9f9f9f'
@@ -66,7 +70,9 @@ describe Gitlab::Badge::Build::Template do
     end
 
     context 'when status does not match any known statuses' do
-      let(:status) { 'invalid status' }
+      before do
+        allow(badge).to receive(:status).and_return('invalid')
+      end
 
       it 'has expected color' do
         expect(template.value_color).to eq '#9f9f9f'
diff --git a/spec/lib/gitlab/badge/coverage/metadata_spec.rb b/spec/lib/gitlab/badge/coverage/metadata_spec.rb
new file mode 100644
index 00000000000..74eaf7eaf8b
--- /dev/null
+++ b/spec/lib/gitlab/badge/coverage/metadata_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'lib/gitlab/badge/shared/metadata'
+
+describe Gitlab::Badge::Coverage::Metadata do
+  let(:badge) do
+    double(project: create(:project), ref: 'feature', job: 'test')
+  end
+
+  let(:metadata) { described_class.new(badge) }
+
+  it_behaves_like 'badge metadata'
+
+  describe '#title' do
+    it 'returns coverage report title' do
+      expect(metadata.title).to eq 'coverage report'
+    end
+  end
+
+  describe '#image_url' do
+    it 'returns valid url' do
+      expect(metadata.image_url).to include 'badges/feature/coverage.svg'
+    end
+  end
+
+  describe '#link_url' do
+    it 'returns valid link' do
+      expect(metadata.link_url).to include 'commits/feature'
+    end
+  end
+end
diff --git a/spec/lib/gitlab/badge/coverage/report_spec.rb b/spec/lib/gitlab/badge/coverage/report_spec.rb
new file mode 100644
index 00000000000..1ff49602486
--- /dev/null
+++ b/spec/lib/gitlab/badge/coverage/report_spec.rb
@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe Gitlab::Badge::Coverage::Report do
+  let(:project) { create(:project) }
+  let(:job_name) { nil }
+
+  let(:badge) do
+    described_class.new(project, 'master', job_name)
+  end
+
+  describe '#entity' do
+    it 'describes a coverage' do
+      expect(badge.entity).to eq 'coverage'
+    end
+  end
+
+  describe '#metadata' do
+    it 'returns correct metadata' do
+      expect(badge.metadata.image_url).to include 'coverage.svg'
+    end
+  end
+
+  describe '#template' do
+    it 'returns correct template' do
+      expect(badge.template.key_text).to eq 'coverage'
+    end
+  end
+
+  shared_examples 'unknown coverage report' do
+    context 'particular job specified' do
+      let(:job_name) { '' }
+
+      it 'returns nil' do
+        expect(badge.status).to be_nil
+      end
+    end
+
+    context 'particular job not specified' do
+      let(:job_name) { nil }
+
+      it 'returns nil' do
+        expect(badge.status).to be_nil
+      end
+    end
+  end
+
+  context 'pipeline exists' do
+    let!(:pipeline) do
+      create(:ci_pipeline, project: project,
+                           sha: project.commit.id,
+                           ref: 'master')
+    end
+
+    context 'builds exist' do
+      before do
+        create(:ci_build, name: 'first', pipeline: pipeline, coverage: 40)
+        create(:ci_build, pipeline: pipeline, coverage: 60)
+      end
+
+      context 'particular job specified' do
+        let(:job_name) { 'first' }
+
+        it 'returns coverage for the particular job' do
+          expect(badge.status).to eq 40
+        end
+      end
+
+      context 'particular job not specified' do
+        let(:job_name) { '' }
+
+        it 'returns arithemetic mean for the pipeline' do
+          expect(badge.status).to eq 50
+        end
+      end
+    end
+
+    context 'builds do not exist' do
+      it_behaves_like 'unknown coverage report'
+
+      context 'particular job specified' do
+        let(:job_name) { 'nonexistent' }
+
+        it 'retruns nil' do
+          expect(badge.status).to be_nil
+        end
+      end
+    end
+  end
+
+  context 'pipeline does not exist' do
+    it_behaves_like 'unknown coverage report'
+  end
+end
diff --git a/spec/lib/gitlab/badge/coverage/template_spec.rb b/spec/lib/gitlab/badge/coverage/template_spec.rb
new file mode 100644
index 00000000000..383bae6e087
--- /dev/null
+++ b/spec/lib/gitlab/badge/coverage/template_spec.rb
@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+describe Gitlab::Badge::Coverage::Template do
+  let(:badge) { double(entity: 'coverage', status: 90) }
+  let(:template) { described_class.new(badge) }
+
+  describe '#key_text' do
+    it 'is always says coverage' do
+      expect(template.key_text).to eq 'coverage'
+    end
+  end
+
+  describe '#value_text' do
+    context 'when coverage is known' do
+      it 'returns coverage percentage' do
+        expect(template.value_text).to eq '90%'
+      end
+    end
+
+    context 'when coverage is unknown' do
+      before do
+        allow(badge).to receive(:status).and_return(nil)
+      end
+
+      it 'returns string that says coverage is unknown' do
+        expect(template.value_text).to eq 'unknown'
+      end
+    end
+  end
+
+  describe '#key_width' do
+    it 'has a fixed key width' do
+      expect(template.key_width).to eq 62
+    end
+  end
+
+  describe '#value_width' do
+    context 'when coverage is known' do
+      it 'is narrower when coverage is known' do
+        expect(template.value_width).to eq 36
+      end
+    end
+
+    context 'when coverage is unknown' do
+      before do
+        allow(badge).to receive(:status).and_return(nil)
+      end
+
+      it 'is wider when coverage is unknown to fit text' do
+        expect(template.value_width).to eq 58
+      end
+    end
+  end
+
+  describe '#key_color' do
+    it 'always has the same color' do
+      expect(template.key_color).to eq '#555'
+    end
+  end
+
+  describe '#value_color' do
+    context 'when coverage is good' do
+      before do
+        allow(badge).to receive(:status).and_return(98)
+      end
+
+      it 'is green' do
+        expect(template.value_color).to eq '#4c1'
+      end
+    end
+
+    context 'when coverage is acceptable' do
+      before do
+        allow(badge).to receive(:status).and_return(90)
+      end
+
+      it 'is green-orange' do
+        expect(template.value_color).to eq '#a3c51c'
+      end
+    end
+
+    context 'when coverage is medium' do
+      before do
+        allow(badge).to receive(:status).and_return(75)
+      end
+
+      it 'is orange-yellow' do
+        expect(template.value_color).to eq '#dfb317'
+      end
+    end
+
+    context 'when coverage is low' do
+      before do
+        allow(badge).to receive(:status).and_return(50)
+      end
+
+      it 'is red' do
+        expect(template.value_color).to eq '#e05d44'
+      end
+    end
+
+    context 'when coverage is unknown' do
+      before do
+        allow(badge).to receive(:status).and_return(nil)
+      end
+
+      it 'is grey' do
+        expect(template.value_color).to eq '#9f9f9f'
+      end
+    end
+  end
+
+  describe '#width' do
+    context 'when coverage is known' do
+      it 'returns the key width plus value width' do
+        expect(template.width).to eq 98
+      end
+    end
+
+    context 'when coverage is unknown' do
+      before do
+        allow(badge).to receive(:status).and_return(nil)
+      end
+
+      it 'returns key width plus wider value width' do
+        expect(template.width).to eq 120
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/badge/shared/metadata.rb b/spec/lib/gitlab/badge/shared/metadata.rb
new file mode 100644
index 00000000000..0cf18514251
--- /dev/null
+++ b/spec/lib/gitlab/badge/shared/metadata.rb
@@ -0,0 +1,21 @@
+shared_examples 'badge metadata' do
+  describe '#to_html' do
+    let(:html) { Nokogiri::HTML.parse(metadata.to_html) }
+    let(:a_href) { html.at('a') }
+
+    it 'points to link' do
+      expect(a_href[:href]).to eq metadata.link_url
+    end
+
+    it 'contains clickable image' do
+      expect(a_href.children.first.name).to eq 'img'
+    end
+  end
+
+  describe '#to_markdown' do
+    subject { metadata.to_markdown }
+
+    it { is_expected.to include metadata.image_url }
+    it { is_expected.to include metadata.link_url }
+  end
+end
diff --git a/spec/models/project_services/irker_service_spec.rb b/spec/models/project_services/irker_service_spec.rb
index 3bed0e6093f..ec092297f4f 100644
--- a/spec/models/project_services/irker_service_spec.rb
+++ b/spec/models/project_services/irker_service_spec.rb
@@ -54,19 +54,20 @@ describe IrkerService, models: true do
     let(:colorize_messages) { '1' }
 
     before do
+      @irker_server = TCPServer.new 'localhost', 0
+
       allow(irker).to receive_messages(
-        active: true,
-        project: project,
-        project_id: project.id,
-        service_hook: true,
-        server_host: 'localhost',
-        server_port: 6659,
-        default_irc_uri: 'irc://chat.freenode.net/',
-        recipients: recipients,
-        colorize_messages: colorize_messages)
+                        active: true,
+                        project: project,
+                        project_id: project.id,
+                        service_hook: true,
+                        server_host: @irker_server.addr[2],
+                        server_port: @irker_server.addr[1],
+                        default_irc_uri: 'irc://chat.freenode.net/',
+                        recipients: recipients,
+                        colorize_messages: colorize_messages)
 
       irker.valid?
-      @irker_server = TCPServer.new 'localhost', 6659
     end
 
     after do