Merge pull request #1 from morniio/support_rails_7

Support rails 7

Author: Abdullah Alyahya

.ruby-version

@@ -1 +1 @@
-2.5.5
+2.7.4

migration-lock-timeout.gemspec

@@ -29,10 +29,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "pg", "< 1.0"
+  spec.add_development_dependency "pg", "~> 1.1"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 11.2.2"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug"
 
-  spec.add_runtime_dependency "activerecord", ">= 4.0", "< 7.0"
+  spec.add_runtime_dependency "activerecord", ">= 4.0", "< 8.0"
 end

spec/migration_lock_timeout/migration_spec.rb

@@ -15,13 +15,20 @@ def expect_create_table
     expect(ActiveRecord::Base.connection).to receive(:execute).
       with(/CREATE TABLE/).
       and_call_original
-  else
+  elsif ActiveRecord::VERSION::STRING < "6.1.0"
     expect(ActiveRecord::Base.connection).to receive(:execute).
       with(/BEGIN/).
       and_call_original
     expect(ActiveRecord::Base.connection).to receive(:execute).
       with(/CREATE TABLE/).
       and_call_original
+  else
+    expect(ActiveRecord::Base.connection).to receive(:execute).
+      with('BEGIN', 'TRANSACTION').
+      and_call_original
+    expect(ActiveRecord::Base.connection).to receive(:execute).
+      with(/CREATE TABLE/).
+      and_call_original
   end
 end
 

spec_helper.rb

@@ -1,4 +1,5 @@
 require 'database_cleaner'
+require 'byebug'
 
 RSpec.configure do |config|
   config.before(:suite) do