cucumber-ci-environment 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fa280ae7a64a91f8851d28e4419f2d391ba080e0e511ed045594175d58c8225
-  data.tar.gz: 9bbe09efed429d2bcad1852c934357d0706a663f6450c33a9dadc62e990e005f
+  metadata.gz: ddb3770efbf64c848ff0784bc16b46bd1aac7310bb3543af9354eefaf934d590
+  data.tar.gz: 963b15c15a33c7b706b43bc3d7e83ca96b4dbe6d8562b3afc3a8909fceb0d4e4
 SHA512:
-  metadata.gz: 7fde55b617bd13cfbdc6766dcf75d67cc6f4cfe0ac9e67d906194ff8b5f7ca1422227dce609435ee420a95fd24048a5d606861c5e4d5a1659f257c88a63439d5
-  data.tar.gz: 0c26bd5ec292118386175d6a2aa707fc025d2994cd516184cdced9aadcbd215d259c3c442181decdf7c781ac34dcbd10b1b8bf8f2a15c049e8f4411ae0437337
+  metadata.gz: 7a6a3f4a3091dba40f37fe3f4831e9eaab18230750536770c891d657d14886ce651e440b136f9a731b2e20f7fb6d0878c92ce8fa6e98ccc2f2569e6e9b88e3b9
+  data.tar.gz: dafdfbf95a1e2a2283844256ddcbabde2c32edd8923c80e515d966e7e8f330f9e0e3a2ee9ef9ccd81cfc433fbc38dfd9c85653b78903dd09fca60238e6080863

data/lib/cucumber/ci_environment.rb

@@ -7,17 +7,17 @@ module Cucumber
     extend VariableExpression
     CI_ENVIRONMENTS_PATH = File.join(File.dirname(__FILE__), 'ci_environment/CiEnvironments.json')
 
-    def detect_ci_environment(env, file_reader = IO.method(:read))
-      ci_environments = JSON.parse(file_reader.call(CI_ENVIRONMENTS_PATH))
+    def detect_ci_environment(env)
+      ci_environments = JSON.parse(IO.read(CI_ENVIRONMENTS_PATH))
       ci_environments.each do |ci_environment|
-        detected = detect(ci_environment, env, file_reader)
+        detected = detect(ci_environment, env)
         return detected unless detected.nil?
       end
 
       nil
     end
 
-    def detect(ci_environment, env, file_reader)
+    def detect(ci_environment, env)
       url = evaluate(ci_environment['url'], env)
       return nil if url.nil?
 
@@ -27,13 +27,13 @@ module Cucumber
         buildNumber: evaluate(ci_environment['buildNumber'], env),
       }
 
-      detected_git = detect_git(ci_environment, env, file_reader)
+      detected_git = detect_git(ci_environment, env)
       result[:git] = detected_git if detected_git
       result
     end
 
-    def detect_git(ci_environment, env, file_reader)
-      revision = detect_revision(ci_environment, env, file_reader)
+    def detect_git(ci_environment, env)
+      revision = detect_revision(ci_environment, env)
       return nil if revision.nil?
 
       remote = evaluate(ci_environment['git']['remote'], env)
@@ -51,12 +51,13 @@ module Cucumber
       git_info
     end
 
-    def detect_revision(ci_environment, env, file_reader)
+    def detect_revision(ci_environment, env)
       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("No after property in #{env['GITHUB_EVENT_PATH']}:\n#{JSON.pretty_generate(event)}") unless event['after']
-        return event['after']
+        event = JSON.parse(IO.read(env['GITHUB_EVENT_PATH']))
+        revision = event['pull_request']['head']['sha'] rescue nil
+        raise StandardError("Could not find .pull_request.head.sha in #{env['GITHUB_EVENT_PATH']}:\n#{JSON.pretty_generate(event)}") if revision.nil?
+        return revision
       end
 
       return evaluate(ci_environment['git']['revision'], env)

data/spec/cucumber/ci_environment/ci_environment_spec.rb

@@ -8,12 +8,7 @@ describe 'detect_ci_environment' do
     context "with #{File.basename(test_data_file, '.txt')}" do
       subject { JSON.parse(ci_environment.to_json) }
 
-      def mock_reader(path)
-        return '{"after": "2436f28fad432a895bfc595bce16e907144b0dc3"}' if path.end_with?('_github_workflow/event.json')
-        IO.read(path)
-      end
-
-      let(:ci_environment) { Cucumber::CiEnvironment.detect_ci_environment(env, method(:mock_reader)) }
+      let(:ci_environment) { Cucumber::CiEnvironment.detect_ci_environment(env) }
       let(:env) { Hash[entries] }
       let(:entries) { env_data.split(/\n/).map { |line| line.split(/=/) } }
       let(:env_data) { IO.read(test_data_file) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.0.3
 platform: ruby
 authors:
 - Vincent Prêtre
@@ -93,7 +93,7 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
-summary: cucumber-ci-environment-9.0.2
+summary: cucumber-ci-environment-9.0.3
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/ci_environment/ci_environment_spec.rb