fix: make the specs pass in Rails 6 too

maglevhq · Nov 28, 2023 · 9bee388 · 9bee388
1 parent b20f057
commit 9bee388
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Gemfile.legacy.lock b/Gemfile.legacy.lock
@@ -146,7 +146,7 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    pg (1.4.6)
+    pg (1.5.4)
     racc (1.7.3)
     rack (2.2.8)
     rack-proxy (0.7.7)
@@ -289,7 +289,7 @@ DEPENDENCIES
   maglevcms!
   mini_magick (~> 4.11)
   nokogiri (>= 1.13.10)
-  pg (~> 1.4.3)
+  pg (~> 1.5.4)
   rails (~> 6.1)
   rspec-rails
   rubocop

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -170,7 +170,7 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    pg (1.4.6)
+    pg (1.5.4)
     psych (5.1.1.1)
       stringio
     racc (1.7.3)
@@ -328,7 +328,7 @@ DEPENDENCIES
   image_processing (~> 1.12.2)
   maglevcms!
   nokogiri (>= 1.13.10)
-  pg (~> 1.4.3)
+  pg (~> 1.5.4)
   rails (~> 7.1)
   rspec-rails
   rubocop

diff --git a/maglevcms.gemspec b/maglevcms.gemspec
@@ -51,6 +51,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'vite_rails', '< 4', '>= 3'
   spec.add_dependency 'vite_ruby', '>= 3.5'
 
-  spec.add_development_dependency 'pg', '~> 1.4.3'
+  spec.add_development_dependency 'pg', '~> 1.5.4'
 end
 # rubocop:enable Metrics/BlockLength
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -46,7 +46,11 @@
 end
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_paths = [File.join(File.dirname(__FILE__), 'fixtures')]
+  if Rails::VERSION::MAJOR > 6
+    config.fixture_paths = [File.join(File.dirname(__FILE__), 'fixtures')]
+  else
+    config.fixture_path = File.join(File.dirname(__FILE__), 'fixtures')
+  end
 
   config.include ActionDispatch::TestProcess::FixtureFile
   config.include FactoryBot::Syntax::Methods