Fix enterprise issue and bump to 0.2.7 (#93)

* Fix enterprise issue and bump to 0.2.7

* Stub enterprise response

* Use proper response

* Fix v2 response

* Oops

* Maybe this is right

* Move to json

* force

Author: thomasrockhu

CHANGELOG.md

@@ -1,3 +1,6 @@
+### `0.2.7`
+- Fix for enterprise users unable to upload using the v4 uploader
+
 ### `0.2.6`
 - Fix issue with `push` events on GitHub Actions
 

codecov.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>=2.4'
   s.summary               = 'hosted code coverage ruby/rails reporter'
   s.test_files            = ['test/test_codecov.rb']
-  s.version               = '0.2.6'
+  s.version               = '0.2.7'
 
   s.add_dependency 'colorize'
   s.add_dependency 'json'

lib/codecov.rb

@@ -8,7 +8,7 @@
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -337,6 +337,7 @@ def gzip_report(report)
 
   def upload_to_codecov(ci, report)
     url = ENV['CODECOV_URL'] || 'https://codecov.io'
+    is_enterprise = url != 'https://codecov.io'
 
     params = build_params(ci)
     params_secret_token = params.clone
@@ -354,8 +355,11 @@ def upload_to_codecov(ci, report)
     puts "    url:   #{url}"
     puts "    query: #{query_without_token}"
 
-    response = upload_to_v4(url, gzipped_report, query, query_without_token)
-    return false if response == false
+    response = false
+    unless is_enterprise
+      response = upload_to_v4(url, gzipped_report, query, query_without_token)
+      return false if response == false
+    end
 
     response || upload_to_v2(url, gzipped_report, query, query_without_token)
   end
@@ -421,11 +425,12 @@ def upload_to_v2(url, report, query, query_without_token)
     https.use_ssl = !url.match(/^https/).nil?
 
     puts ['-> '.green, 'Uploading to Codecov'].join(' ')
-    puts "#{url}/#{uri.path}?#{query_without_token}"
+    puts "#{url}#{uri.path}?#{query_without_token}"
 
     req = Net::HTTP::Post.new(
       "#{uri.path}?#{query}",
       {
+        'Accept' => 'application/json',
         'Content-Encoding' => 'gzip',
         'Content-Type' => 'text/plain',
         'X-Content-Encoding' => 'gzip'

test/test_codecov.rb

@@ -80,7 +80,7 @@ def upload(success = true)
   end
 
   def success_stubs
-    stub_request(:post, %r{https:\/\/codecov.io\/upload})
+    stub_request(:post, %r{https:\/\/codecov.io\/upload\/v4})
       .to_return(
         status: 200,
         body: "https://codecov.io/gh/fake\n" \
@@ -229,6 +229,23 @@ def test_git
     assert_equal(`git rev-parse HEAD`.strip, result['params'][:commit])
   end
 
+  def test_enterprise
+    stub = stub_request(:post, %r{https:\/\/example.com\/upload\/v2})
+      .to_return(
+        status: 200,
+        body: "{\"id\": \"12345678-1234-abcd-ef12-1234567890ab\", \"message\": \"Coverage reports upload successfully\", \"meta\": { \"status\": 200 }, \"queued\": true, \"uploaded\": true, \"url\": \"https://example.com/github/codecov/codecov-bash/commit/2f6b51562b93e72c610671644fe2a303c5c0e8e5\"}"
+      )
+
+    ENV['CODECOV_URL'] = 'https://example.com'
+    ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
+    result = upload
+    assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+    assert_equal('12345678-1234-abcd-ef12-1234567890ab', result['result']['id'])
+    branch = `git rev-parse --abbrev-ref HEAD`.strip
+    assert_equal(branch != 'HEAD' ? branch : 'master', result['params'][:branch])
+    assert_equal(`git rev-parse HEAD`.strip, result['params'][:commit])
+  end
+
   def test_travis
     ENV['CI'] = 'true'
     ENV['TRAVIS'] = 'true'