From 03ea01946524a74773b24430c81804c2724b84b6 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Thu, 4 Aug 2016 11:29:41 +0200
Subject: [PATCH] CI build status not per environment

---
 .../merge_requests/widget/_heading.html.haml  | 36 +++++++++----------
 spec/models/deployment_spec.rb                |  3 +-
 spec/models/merge_request_spec.rb             |  5 ++-
 .../merge_requests/_heading.html.haml_spec.rb |  2 +-
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 9590c1dbbd1..16e923b831c 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,18 +1,17 @@
 - if @pipeline
   .mr-widget-heading
-    - @merge_request.environments.each do |environments|
-      - %w[success success_with_warnings skipped canceled failed running pending].each do |status|
-        .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
-          = ci_icon_for_status(status)
-          %span
-            CI build
-            = ci_label_for_status(status)
-          for
-          - commit = @merge_request.diff_head_commit
-          = succeed "." do
-            = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace"
-          %span.ci-coverage
-          = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
+    - %w[success success_with_warnings skipped canceled failed running pending].each do |status|
+      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) }
+        = ci_icon_for_status(status)
+        %span
+          CI build
+          = ci_label_for_status(status)
+        for
+        - commit = @merge_request.diff_head_commit
+        = succeed "." do
+          = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace"
+        %span.ci-coverage
+        = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
 
 - elsif @merge_request.has_ci?
   - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
@@ -48,9 +47,8 @@
   .mr-widget-heading
     .ci_widget{ class: "ci-success" }
       = ci_icon_for_status("success")
-      %span
-        Released to #{environment.name}
-        = succeed '.' do
-          = time_ago_with_tooltip(environment.created_at, placement: 'bottom')
-        - if environment.external_url
-          = link_to icon('external-link'), environment.external_url
+      %span.hidden-sm
+        Released to #{environment.name}.
+        - external_url = environment.external_url
+        - if external_url
+          = link_to icon('external-link', text: "View on #{external_url.gsub(/\A.*?:\/\//, '')}"), external_url
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 107f8b38acf..d7cb142dd32 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -20,7 +20,8 @@ describe Deployment, models: true do
     let(:project)     { create(:project) }
     let(:environment) { create(:environment, project: project) }
     let(:deployment) do
-      create(:deployment, environment: environment, sha: '5f923865dde3436854e9ceb9cdb7815618d4e849')
+      create(:deployment, environment: environment,
+                          sha: '5f923865dde3436854e9ceb9cdb7815618d4e849')
     end
 
     context 'when there is no project commit' do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 0727dd29951..e605720a2dd 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -677,7 +677,10 @@ describe MergeRequest, models: true do
   describe "#environments" do
     let(:project)       { create(:project) }
 
-    let!(:deployment)   { create(:deployment, environment: environment, sha: '5f923865dde3436854e9ceb9cdb7815618d4e849') }
+    let!(:deployment) do
+      create(:deployment, environment: environment,
+                          sha: '5f923865dde3436854e9ceb9cdb7815618d4e849')
+    end
 
     let!(:environment)  { create(:environment, project: project) }
     let!(:environment1) { create(:environment, project: project) }
diff --git a/spec/views/projects/merge_requests/_heading.html.haml_spec.rb b/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
index 843a496f4c3..0302f14e660 100644
--- a/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
@@ -19,7 +19,7 @@ describe 'projects/merge_requests/widget/_heading' do
     end
 
     it 'displays that the environment is deployed' do
-      expect(rendered).to match('Released to')
+      expect(rendered).to match("Released to #{environment.name}")
     end
   end
 end
-- 
GitLab