cucumber-ci-environment 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b113a16cc3df5fa4c163edac4bed8dc9cc479b03d7bc873d0e35e551b17e133
-  data.tar.gz: b350572faa0a9f959d12dfbda6b3b323cf3d18e9a46635d813af29a808f6dd27
+  metadata.gz: 1fa280ae7a64a91f8851d28e4419f2d391ba080e0e511ed045594175d58c8225
+  data.tar.gz: 9bbe09efed429d2bcad1852c934357d0706a663f6450c33a9dadc62e990e005f
 SHA512:
-  metadata.gz: b094712321f9251fab4120c75ed7fd261e187cced6aea4ed0e5fffaf8703b9dc679f5b0a7eb9979c6ff66fe7d40427fface9b156940d2f6c120b9d2785948475
-  data.tar.gz: 71a3c6542c46d9064cc4f276378ca4c9296cbff2be31a7a6073bf78d36f74c88ef23affc4f941eedcd35ca25cc4bb1e155f27c83b87f86dd5e344010a9e8873c
+  metadata.gz: 7fde55b617bd13cfbdc6766dcf75d67cc6f4cfe0ac9e67d906194ff8b5f7ca1422227dce609435ee420a95fd24048a5d606861c5e4d5a1659f257c88a63439d5
+  data.tar.gz: 0c26bd5ec292118386175d6a2aa707fc025d2994cd516184cdced9aadcbd215d259c3c442181decdf7c781ac34dcbd10b1b8bf8f2a15c049e8f4411ae0437337

data/lib/cucumber/ci_environment/CiEnvironments.json

@@ -80,7 +80,7 @@
     "git": {
       "remote": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git",
       "revision": "${GITHUB_SHA}",
-      "branch": "${GITHUB_REF/refs\/heads\/(.*)/\\1}",
+      "branch": "${GITHUB_HEAD_REF}",
       "tag": "${GITHUB_REF/refs\/tags\/(.*)/\\1}"
     }
   },

data/lib/cucumber/ci_environment.rb

@@ -55,8 +55,8 @@ module Cucumber
       if env['GITHUB_EVENT_NAME'] == 'pull_request'
         raise StandardError('GITHUB_EVENT_PATH not set') unless env['GITHUB_EVENT_PATH']
         event = JSON.parse(file_reader.call(env['GITHUB_EVENT_PATH']))
-        raise StandardError('GITHUB_EVENT_PATH not set') unless event['before']
-        return event['before']
+        raise StandardError("No after property in #{env['GITHUB_EVENT_PATH']}:\n#{JSON.pretty_generate(event)}") unless event['after']
+        return event['after']
       end
 
       return evaluate(ci_environment['git']['revision'], env)

data/spec/cucumber/ci_environment/ci_environment_spec.rb

@@ -9,7 +9,7 @@ describe 'detect_ci_environment' do
       subject { JSON.parse(ci_environment.to_json) }
 
       def mock_reader(path)
-        return '{"before": "2436f28fad432a895bfc595bce16e907144b0dc3"}' if path.end_with?('_github_workflow/event.json')
+        return '{"after": "2436f28fad432a895bfc595bce16e907144b0dc3"}' if path.end_with?('_github_workflow/event.json')
         IO.read(path)
       end
 

data/spec/cucumber/ci_environment/github_pull_request_integration_spec.rb

@@ -0,0 +1,10 @@
+describe 'GitHub' do
+  if (ENV['GITHUB_EVENT_NAME'] == 'pull_request')
+    it 'detects the correct revision for pull requests' do
+      ci_environment = Cucumber::CiEnvironment.detect_ci_environment(ENV)
+      expect(ci_environment).to be_truthy
+      puts ("Manually verify that the revision is correct");
+      p ci_environment
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Vincent Prêtre
@@ -63,6 +63,7 @@ files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb
 - spec/cucumber/ci_environment/evaluate_variable_expression_spec.rb
+- spec/cucumber/ci_environment/github_pull_request_integration_spec.rb
 - spec/cucumber/ci_environment/remove_userinfo_from_url_spec.rb
 homepage: https://github.com/cucumber/ci-environment
 licenses:
@@ -92,9 +93,10 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: cucumber-ci-environment-9.0.1
+summary: cucumber-ci-environment-9.0.2
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb
 - spec/cucumber/ci_environment/evaluate_variable_expression_spec.rb
+- spec/cucumber/ci_environment/github_pull_request_integration_spec.rb
 - spec/cucumber/ci_environment/remove_userinfo_from_url_spec.rb