codecov 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0935d5766e38b05f8e3c567c1b16dfd7763902ac06073eabb8a3dc49768fec31'
-  data.tar.gz: 3a97f5b053e2e5a934fbe5fb5f13401d0c6befed9e20d7d9ca53990469946c48
+  metadata.gz: 8b2e67c7bb37041adf9adb9dbe2fd8f9c2966131d338961785a29b25090e7206
+  data.tar.gz: 2ada93e046953b7e77397831259a21fcaef09012f4ea0c2c4584668b080d68a6
 SHA512:
-  metadata.gz: 7fd075c6ec939eb9cd895c24d7e96199bb2fc4a501219c7af6f8ada9e0242f8cccb841b06d7c179c10bf5716ad08b41a101a50ed8db56c90cfe0112fb4f50dc5
-  data.tar.gz: 7db5f6d020b1a71cff306b11ef7a4304e5606b691264cb66015b1c11a9254c0f7cac7f8222d4f4ff1c03c55484a1548b1c09d366909ba7ceb8e50951d083fa5c
+  metadata.gz: faf56288e9f75ee77f230da561da1ee87e3305fa7220e4b5962e2011e7f7d8c1f3c1a234a386ac698b00ad8999f500787f6b218c78c9009cb25bc096c056093c
+  data.tar.gz: 233cbebb75102d82b62daf1087a490493ee3cef84de7e91163bc8c5040076f2f1798ebde32aa7971c2234c306adcc13c7a3abcc1929489c1aba124a319f195cb

data/lib/codecov.rb

@@ -8,7 +8,7 @@ require 'colorize'
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -178,9 +178,9 @@ class SimpleCov::Formatter::Codecov
     when GITHUB
       # https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables
       params[:service] = 'github-actions'
-      params[:branch] = ENV['GITHUB_HEAD_REF'] || ENV['GITHUB_REF'].sub('refs/heads/', '')
-      # PR refs are in the format: refs/pull/7/merge
-      params[:pr] = ENV['GITHUB_REF'].split('/')[2] if ENV['GITHUB_HEAD_REF']
+      params[:branch] = ENV['GITHUB_HEAD_REF'] || ENV['GITHUB_REF'].sub('refs/head/', '')
+      # PR refs are in the format: refs/pull/7/merge for pull_request events
+      params[:pr] = ENV['GITHUB_REF'].split('/')[2] unless ENV['GITHUB_HEAD_REF'].nil? || ENV['GITHUB_HEAD_REF'].empty?
       params[:slug] = ENV['GITHUB_REPOSITORY']
       params[:build] = ENV['GITHUB_RUN_ID']
       params[:commit] = ENV['GITHUB_SHA']

data/test/test_codecov.rb

@@ -425,9 +425,29 @@ class TestCodecov < Minitest::Test
     assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
   end
 
-  def test_github
+  def test_github_pull_request
     ENV['CI'] = 'true'
     ENV['GITHUB_ACTIONS'] = 'true'
+    ENV['GITHUB_HEAD_REF'] = 'patch-2'
+    ENV['GITHUB_REF'] = 'refs/pull/7/merge'
+    ENV['GITHUB_REPOSITORY'] = 'codecov/ci-repo'
+    ENV['GITHUB_RUN_ID'] = '1'
+    ENV['GITHUB_SHA'] = 'c739768fcac68144a3a6d82305b9c4106934d31a'
+    ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
+    result = upload
+    assert_equal('github-actions', result['params'][:service])
+    assert_equal('c739768fcac68144a3a6d82305b9c4106934d31a', result['params'][:commit])
+    assert_equal('codecov/ci-repo', result['params'][:slug])
+    assert_equal('1', result['params'][:build])
+    assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+    assert_equal('patch-2', result['params'][:branch])
+    assert_equal('7', result['params'][:pr])
+  end
+
+  def test_github_push
+    ENV['CI'] = 'true'
+    ENV['GITHUB_ACTIONS'] = 'true'
+    ENV['GITHUB_HEAD_REF'] = nil
     ENV['GITHUB_REF'] = 'refs/head/master'
     ENV['GITHUB_REPOSITORY'] = 'codecov/ci-repo'
     ENV['GITHUB_RUN_ID'] = '1'
@@ -439,6 +459,8 @@ class TestCodecov < Minitest::Test
     assert_equal('codecov/ci-repo', result['params'][:slug])
     assert_equal('1', result['params'][:build])
     assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+    assert_equal('master', result['params'][:branch])
+    assert_equal(false, result['params'].key?(:pr))
   end
 
   def test_gitlab

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="