Merge pull request #133 from FundingCircle/allow-running-the-build-manually

Allow running builds from contributors

Author: bliof-fc

.github/workflows/build-and-test.yml

@@ -3,8 +3,8 @@ run-name:  Build & Test - ${{ github.ref_name }}
 
 on:
   push:
-    branches:
-      - '**'
+    branches: [ master ]
+  pull_request:
 
 jobs:
   version-check:

spec/integration/sinatra_spec.rb

@@ -122,7 +122,14 @@ class MySinatraApp < Sinatra::Base
       it 'logs the request with the exception' do
         get '/error', {}, 'HTTP_X_REQUEST_ID' => '700a6a01'
 
-        expect(last_log_entry).to start_with("E, #{time_pid_tags} GET /error 500 in 0ms type=request #{data_as_text} exception=undefined method `name' for nil")
+        exception_line =
+          if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.4.0dev')
+            "E, #{time_pid_tags} GET /error 500 in 0ms type=request #{data_as_text} exception=undefined method 'name' for nil"
+          else
+            "E, #{time_pid_tags} GET /error 500 in 0ms type=request #{data_as_text} exception=undefined method `name' for nil"
+          end
+
+        expect(last_log_entry).to start_with(exception_line)
       end
     end
   end

spec/support/request_spec.rb

@@ -97,6 +97,13 @@
           { username: 'yoshi' },
           'HTTP_USER_AGENT' => 'Chrome', 'HTTP_X_REQUEST_ID' => '471a34dc'
 
+      method_missing_exception =
+        if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.4.0dev')
+          "undefined method 'name' for nil"
+        else
+          "undefined method `name' for nil"
+        end
+
       expect(last_log_entry).to include(
         'version' => '1.1',
         'host' => 'bird.example.com',
@@ -115,7 +122,7 @@
         '_request.request_id' => '471a34dc',
         '_request.duration' => 0,
         '_exception.klass' => 'NoMethodError',
-        '_exception.message' => start_with("undefined method `name' for nil"),
+        '_exception.message' => start_with(method_missing_exception),
         '_exception.backtrace' => be_a(String),
         '_tags' => '471a34dc TEST_TAG',
       )