Merge pull request #62 from codeclimate/ia-new-pr-status-only-for-repos-with-feature-flag

Show new PR status message only for repos with beta feature enabled

Author: iancanderson

lib/cc/service.rb

@@ -69,10 +69,11 @@ def self.slug
       end
     end
 
-    def initialize(config, payload)
-      @payload = payload.stringify_keys
-      @config  = create_config(config)
-      @event   = @payload["name"].to_s
+    def initialize(config, payload, repo_config)
+      @payload     = payload.stringify_keys
+      @config      = create_config(config)
+      @event       = @payload["name"].to_s
+      @repo_config = repo_config
 
       load_helper
       validate_event

lib/cc/services/github_pull_requests.rb

@@ -70,10 +70,11 @@ def update_status_skipped
 
   def update_status_success
     add_comment
-    update_status(
-      "success",
-      CC::Service::GitHubPullRequests::Presenter.new(@payload).success_message
-    )
+    update_status("success", presenter.success_message)
+  end
+
+  def presenter
+    CC::Service::GitHubPullRequests::Presenter.new(@payload, @repo_config)
   end
 
   def update_status_error

lib/cc/services/github_pull_requests_presenter.rb

@@ -1,11 +1,17 @@
 class CC::Service::GitHubPullRequests::Presenter
-  def initialize(payload)
-    @fixed_count = payload["fixed_issue_count"]
-    @new_count = payload["new_issue_count"]
+  def initialize(payload, repo_config)
+    issue_comparison_counts = payload["issue_comparison_counts"]
+
+    if issue_comparison_counts
+      @fixed_count = issue_comparison_counts["fixed"]
+      @new_count = issue_comparison_counts["new"]
+    end
+
+    @repo_config = repo_config
   end
 
   def success_message
-    if issue_counts_in_payload?
+    if @repo_config.pr_status_quality_stats?
       if both_issue_counts_zero?
         "Code Climate didn't find any new or fixed issues."
       else

service_test.rb

@@ -31,6 +31,12 @@ def call
   end
 end
 
+class FalsyRepoConfig
+  def method_missing(*args)
+    false
+  end
+end
+
 class ServiceTest
   def initialize(klass, *params)
     @klass = klass
@@ -68,7 +74,11 @@ def to_env_var(param)
   def test_service(klass, config, payload)
     repo_name = ENV["REPO_NAME"] || "App"
 
-    service = klass.new(config, { name: :test, repo_name: repo_name }.merge(payload))
+    service = klass.new(
+      config,
+      { name: :test, repo_name: repo_name }.merge(payload),
+      FalsyRepoConfig.new
+    )
 
     CC::Service::Invocation.new(service) do |i|
       i.wrap(WithResponseLogging)

test/github_pull_requests_presenter_test.rb

@@ -1,51 +1,58 @@
 require File.expand_path('../helper', __FILE__)
 
 class TestGitHubPullRequestsPresenter < CC::Service::TestCase
-  def test_message_no_issue_counts_in_payload
+  def test_message_quality_stats_not_enabled
     assert_equal(
       "Code Climate has analyzed this pull request.",
-      message_from_payload({})
+      build_presenter(false, "fixed" => 1, "new" => 1).success_message
     )
   end
 
   def test_message_singular
     assert_equal(
       "Code Climate found 1 new issue and 1 fixed issue.",
-      message_from_payload("fixed_issue_count" => 1, "new_issue_count" => 1)
+      build_presenter(true, "fixed" => 1, "new" => 1).success_message
     )
   end
 
   def test_message_plural
     assert_equal(
       "Code Climate found 2 new issues and 1 fixed issue.",
-      message_from_payload("fixed_issue_count" => 1, "new_issue_count" => 2)
+      build_presenter(true, "fixed" => 1, "new" => 2).success_message
     )
   end
 
   def test_message_only_fixed
     assert_equal(
       "Code Climate found 1 fixed issue.",
-      message_from_payload("fixed_issue_count" => 1, "new_issue_count" => 0)
+      build_presenter(true, "fixed" => 1, "new" => 0).success_message
     )
   end
 
   def test_message_only_new
     assert_equal(
       "Code Climate found 3 new issues.",
-      message_from_payload("fixed_issue_count" => 0, "new_issue_count" => 3)
+      build_presenter(true, "fixed" => 0, "new" => 3).success_message
     )
   end
 
   def test_message_no_new_or_fixed
     assert_equal(
       "Code Climate didn't find any new or fixed issues.",
-      message_from_payload("fixed_issue_count" => 0, "new_issue_count" => 0)
+      build_presenter(true, "fixed" => 0, "new" => 0).success_message
     )
   end
 
 private
 
-  def message_from_payload(payload)
-    CC::Service::GitHubPullRequests::Presenter.new(payload).success_message
+  def build_payload(issue_counts)
+    { "issue_comparison_counts" => issue_counts }
+  end
+
+  def build_presenter(quality_stats_enabled, issue_counts)
+    CC::Service::GitHubPullRequests::Presenter.new(
+      build_payload(issue_counts),
+      OpenStruct.new(pr_status_quality_stats?: quality_stats_enabled)
+    )
   end
 end

test/github_pull_requests_test.rb

@@ -20,13 +20,19 @@ def test_pull_request_status_success_detailed
       "description" => "Code Climate found 1 new issue and 2 fixed issues.",
     })
 
-    receive_pull_request({ update_status: true }, {
-      github_slug: "pbrisbin/foo",
-      commit_sha:  "abc123",
-      state:       "success",
-      new_issue_count: 1,
-      fixed_issue_count: 2,
-    })
+    receive_pull_request(
+      { update_status: true },
+      {
+        github_slug: "pbrisbin/foo",
+        commit_sha:  "abc123",
+        state:       "success",
+        issue_comparison_counts: {
+          "fixed" => 2,
+          "new"   => 1,
+        }
+      },
+      true
+    )
   end
 
   def test_pull_request_status_success_generic
@@ -238,11 +244,12 @@ def expect_comment(repo, number, content)
     end
   end
 
-  def receive_pull_request(config, event_data)
+  def receive_pull_request(config, event_data, truthy_repo_config = false)
     receive(
       CC::Service::GitHubPullRequests,
       { oauth_token: "123" }.merge(config),
-      { name: "pull_request" }.merge(event_data)
+      { name: "pull_request" }.merge(event_data),
+      truthy_repo_config ? TruthyRepoConfig.new : FalsyRepoConfig.new
     )
   end
 

test/helper.rb

@@ -25,8 +25,8 @@ def teardown
     @stubs.verify_stubbed_calls
   end
 
-  def service(klass, data, payload)
-    service = klass.new(data, payload)
+  def service(klass, data, payload, repo_config = FalsyRepoConfig.new)
+    service = klass.new(data, payload, repo_config)
     service.http :adapter => [:test, @stubs]
     service
   end
@@ -47,4 +47,16 @@ def stub_http(url, response = nil, &block)
     block ||= lambda{|*args| response }
     @stubs.post(url, &block)
   end
+
+  class FalsyRepoConfig
+    def method_missing(*args)
+      false
+    end
+  end
+
+  class TruthyRepoConfig
+    def method_missing(*args)
+      true
+    end
+  end
 end

test/service_test.rb

@@ -3,26 +3,26 @@
 class TestService < CC::Service::TestCase
   def test_validates_events
     assert_raises(ArgumentError) do
-      CC::Service.new(:foo, {}, {})
+      CC::Service.new(:foo, {}, {}, {})
     end
   end
 
   def test_default_path_to_ca_file
-    s = CC::Service.new({}, {name: "test"})
+    s = CC::Service.new({}, {name: "test"}, FalsyRepoConfig.new)
     assert_equal(File.expand_path("../../config/cacert.pem", __FILE__), s.ca_file)
     assert File.exist?(s.ca_file)
   end
 
   def test_custom_path_to_ca_file
     ENV["CODECLIMATE_CA_FILE"] = "/tmp/cacert.pem"
-    s = CC::Service.new({}, {name: "test"})
+    s = CC::Service.new({}, {name: "test"}, FalsyRepoConfig.new)
     assert_equal("/tmp/cacert.pem", s.ca_file)
   ensure
     ENV.delete("CODECLIMATE_CA_FILE")
   end
 
   def test_nothing_has_a_handler
-    service = CC::Service.new({}, {name: "test"})
+    service = CC::Service.new({}, {name: "test"}, FalsyRepoConfig.new)
 
     result = service.receive