Reinstating the check against the appraisal environment variable - rspec tests were not passing locally without this (#284)

neilwilliams · neilwilliamsdvla · web-flow · commit 0c8f3dda8406 · 2020-11-03T21:49:26.000+01:00
Co-authored-by: Neil Williams &lt;neil.williams@dvla.gov.uk&gt;
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.25", platform: :jruby
-gem "rails", "4.2.11.1"
+gem "rails", "4.2.11.3"
 gem "rspec-rails", "~> 3.7"
 gem "sprockets", "~> 3.7"
 gem "sqlite3", "< 1.4.0", platform: :ruby
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -19,7 +19,7 @@
 ##
 # Detect Rails/Sinatra dummy application based on gemfile name substituted by Appraisal
 #
-if ENV['GITHUB_ACTIONS']
+if ENV['APPRAISAL_INITIALIZED'] || ENV['GITHUB_ACTIONS']
   app_name = Pathname.new(ENV['BUNDLE_GEMFILE']).basename.sub('.gemfile', '')
 else
   /.*?(?<app_name>rails.*?)\.gemfile/ =~ Dir["gemfiles/rails*.gemfile"].sort.last

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`##`
`20`	`20`	`# Detect Rails/Sinatra dummy application based on gemfile name substituted by Appraisal`
`21`	`21`	`#`
`22`		`-if ENV['GITHUB_ACTIONS']`
	`22`	`+if ENV['APPRAISAL_INITIALIZED'] \|\| ENV['GITHUB_ACTIONS']`
`23`	`23`	`app_name = Pathname.new(ENV['BUNDLE_GEMFILE']).basename.sub('.gemfile', '')`
`24`	`24`	`else`
`25`	`25`	`/.?(?<app_name>rails.?)\.gemfile/ =~ Dir["gemfiles/rails*.gemfile"].sort.last`