From 0df772e8600fe72ce1eb0ea1b54714f9a4c1828d Mon Sep 17 00:00:00 2001
From: Alexander Mankuta <alex@pointless.one>
Date: Mon, 10 Jul 2017 19:17:21 +0300
Subject: [PATCH] Changed status messages

---
 lib/cc/presenters/pull_requests_presenter.rb       | 10 ++++------
 spec/cc/presenters/pull_requests_presenter_spec.rb | 10 +++++-----
 spec/cc/service/github_pull_requests_spec.rb       |  6 +++---
 spec/cc/service/gitlab_merge_requests_spec.rb      |  4 ++--
 spec/cc/service/stash_pull_requests_spec.rb        |  4 ++--
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/lib/cc/presenters/pull_requests_presenter.rb b/lib/cc/presenters/pull_requests_presenter.rb
index fb00448..3bc76a1 100644
--- a/lib/cc/presenters/pull_requests_presenter.rb
+++ b/lib/cc/presenters/pull_requests_presenter.rb
@@ -48,14 +48,12 @@ def coverage_message
       def success_message
         if @approved_by
           approved_message
-        elsif @new_count > 0 && @fixed_count > 0
-          "#{@new_count} new #{"issue".pluralize(@new_count)} (#{@fixed_count} fixed)"
-        elsif @new_count <= 0 && @fixed_count > 0
+        elsif @new_count > 0
+          "#{@new_count} #{"issue".pluralize(@new_count)} to fix"
+        elsif @fixed_count > 0
           "#{@fixed_count} fixed #{"issue".pluralize(@fixed_count)}"
-        elsif @new_count > 0 && @fixed_count <= 0
-          "#{@new_count} new #{"issue".pluralize(@new_count)}"
         else
-          "no new or fixed issues"
+          "All good!"
         end
       end
 
diff --git a/spec/cc/presenters/pull_requests_presenter_spec.rb b/spec/cc/presenters/pull_requests_presenter_spec.rb
index fe33dd1..dbec611 100644
--- a/spec/cc/presenters/pull_requests_presenter_spec.rb
+++ b/spec/cc/presenters/pull_requests_presenter_spec.rb
@@ -3,12 +3,12 @@
 describe CC::Service::PullRequestsPresenter, type: :service do
   it "message singular" do
     expect(build_presenter("fixed" => 1, "new" => 1).success_message).
-      to eq("1 new issue (1 fixed)")
+      to eq("1 issue to fix")
   end
 
   it "message plural" do
     expect(build_presenter("fixed" => 1, "new" => 2).success_message).
-      to eq("2 new issues (1 fixed)")
+      to eq("2 issues to fix")
   end
 
   it "message only fixed" do
@@ -18,12 +18,12 @@
 
   it "message only new" do
     expect(build_presenter("fixed" => 0, "new" => 3).success_message).
-      to eq("3 new issues")
+      to eq("3 issues to fix")
   end
 
   it "message no new or fixed" do
     expect(build_presenter("fixed" => 0, "new" => 0).success_message).
-      to eq("no new or fixed issues")
+      to eq("All good!")
   end
 
   it "message coverage same" do
@@ -45,7 +45,7 @@
 
   it "message approved is empty string" do
     expect(build_presenter({"fixed" => 1, "new" => 1}, { "approved_by" => ""}).success_message).
-      to eq("1 new issue (1 fixed)")
+      to eq("1 issue to fix")
   end
 
   private
diff --git a/spec/cc/service/github_pull_requests_spec.rb b/spec/cc/service/github_pull_requests_spec.rb
index 527c3a8..a72fbb1 100644
--- a/spec/cc/service/github_pull_requests_spec.rb
+++ b/spec/cc/service/github_pull_requests_spec.rb
@@ -10,7 +10,7 @@
 
   it "pull request status success detailed" do
     expect_status_update("pbrisbin/foo", "abc123", "state" => "success",
-      "description" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     receive_pull_request(
       {},
@@ -22,7 +22,7 @@
 
   it "pull request status failure" do
     expect_status_update("pbrisbin/foo", "abc123", "state" => "failure",
-      "description" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     receive_pull_request(
       {},
@@ -34,7 +34,7 @@
 
   it "pull request status success generic" do
     expect_status_update("pbrisbin/foo", "abc123", "state" => "success",
-      "description" => /2 new issues \(1 fixed\)/)
+      "description" => "2 issues to fix")
 
     receive_pull_request({}, github_slug: "pbrisbin/foo",
                              commit_sha:  "abc123",
diff --git a/spec/cc/service/gitlab_merge_requests_spec.rb b/spec/cc/service/gitlab_merge_requests_spec.rb
index c01c37d..d1ff253 100644
--- a/spec/cc/service/gitlab_merge_requests_spec.rb
+++ b/spec/cc/service/gitlab_merge_requests_spec.rb
@@ -20,7 +20,7 @@
       "hal/hal9000",
       "abc123",
       "state" => "success",
-      "description" => "2 new issues (1 fixed)",
+      "description" => "2 issues to fix",
     )
 
     receive_merge_request(
@@ -36,7 +36,7 @@
       "hal/hal9000",
       "abc123",
       "state" => "failed",
-      "description" => "2 new issues (1 fixed)",
+      "description" => "2 issues to fix",
     )
 
     receive_merge_request(
diff --git a/spec/cc/service/stash_pull_requests_spec.rb b/spec/cc/service/stash_pull_requests_spec.rb
index 2081a1c..507fd93 100644
--- a/spec/cc/service/stash_pull_requests_spec.rb
+++ b/spec/cc/service/stash_pull_requests_spec.rb
@@ -31,7 +31,7 @@
 
   it "pull request status success detailed" do
     expect_status_update("abc123", "state" => "SUCCESSFUL",
-      "description" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     receive_pull_request(
       commit_sha: "abc123",
@@ -41,7 +41,7 @@
 
   it "pull request status failure" do
     expect_status_update("abc123", "state" => "FAILED",
-      "description" => "2 new issues (1 fixed)")
+      "description" => "2 issues to fix")
 
     receive_pull_request(
       commit_sha: "abc123",