👷 Update test harness

Author: pboling

.idea/workspace.xml

@@ -29,5 +29,5 @@
 # Ensure database schema is loaded
 # Combustion should handle this automatically, but we'll be explicit
 if ActiveRecord::Base.connection.tables.empty?
-  load File.expand_path("../internal/db/schema.rb", __dir__)
+  load File.expand_path("internal/db/schema.rb", __dir__)
 end

spec/support/combustion_helper.rb spec/combustion_helper.rbspec/support/combustion_helper.rb renamed to spec/combustion_helper.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "integration_helper"
-
 # Only run on latest Ruby
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+  require "integration_helper"
   require "rom"
   require "rom-sql"
 

spec/integration/hanami_spec.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "integration_helper"
-
 # Only run on latest Ruby
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
-  # Load Combustion and Rails
-  require_relative "../support/combustion_helper"
+  require "integration_helper"
+  require "combustion_helper"
 
   RSpec.describe "Rails Integration", :integration, integration_framework: :rails do
     include Rack::Test::Methods

spec/integration/rails_spec.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "integration_helper"
-
 # Only run on latest Ruby
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+  require "integration_helper"
   require "roda"
   require "rom"
   require "rom-sql"

spec/integration/roda_spec.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "integration_helper"
-
 # Only run on latest Ruby
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+  require "integration_helper"
   require_relative "../dummies/sinatra_app/app"
 
   RSpec.describe "Sinatra Integration", :integration, integration_framework: :sinatra do