Upgrade required sqlite version to 2.2, fix json spec

railsadminteam · Nov 20, 2024 · 4c56c7b · 4c56c7b
1 parent bee3539
commit 4c56c7b
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 9 deletions.
diff --git a/Appraisals b/Appraisals
@@ -96,6 +96,7 @@ end
 
 appraise 'rails-8.0' do
   gem 'rails', '~> 8.0.0'
+  gem 'sqlite3', '~> 2.2'
   gem 'importmap-rails', require: false
 end
 

diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile
@@ -48,7 +48,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem "mysql2", ">= 0.3.14"
     gem "pg", ">= 1.0.0"
-    gem "sqlite3", "~> 1.3"
+    gem "sqlite3", "~> 2.2"
   end
 end
 

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -48,7 +48,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem "mysql2", ">= 0.3.14"
     gem "pg", ">= 1.0.0"
-    gem "sqlite3", "~> 1.3"
+    gem "sqlite3", "~> 2.2"
   end
 
   platforms :jruby do

diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -47,7 +47,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem "mysql2", ">= 0.3.14"
     gem "pg", ">= 1.0.0"
-    gem "sqlite3", "~> 1.3"
+    gem "sqlite3", "~> 2.2"
   end
 
   platforms :jruby do

diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -48,7 +48,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem "mysql2", ">= 0.3.14"
     gem "pg", ">= 1.0.0"
-    gem "sqlite3", "~> 1.3"
+    gem "sqlite3", "~> 2.2"
   end
 
   platforms :jruby do

diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
@@ -48,7 +48,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem "mysql2", ">= 0.3.14"
     gem "pg", ">= 1.0.0"
-    gem "sqlite3", "~> 1.3"
+    gem "sqlite3", "~> 2.2"
   end
 end
 

diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
@@ -48,7 +48,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem "mysql2", ">= 0.3.14"
     gem "pg", ">= 1.0.0"
-    gem "sqlite3", "~> 1.3"
+    gem "sqlite3", "~> 2.2"
   end
 end
 

diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
@@ -11,6 +11,7 @@ gem "turbo-rails"
 gem "vite_rails", require: false
 gem "webpacker", require: false
 gem "webrick"
+gem "sqlite3", "~> 2.2"
 gem "importmap-rails", require: false
 
 group :development, :test do

diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile
@@ -14,7 +14,7 @@ group :active_record do
   platforms :ruby, :mswin, :mingw do
     gem 'mysql2', '>= 0.3.14'
     gem 'pg', '>= 0.14'
-    gem 'sqlite3', '~> 1.3'
+    gem 'sqlite3', '~> 2.2'
   end
 
   gem 'paper_trail', '>= 12.0'

diff --git a/spec/rails_admin/config/fields/types/json_spec.rb b/spec/rails_admin/config/fields/types/json_spec.rb
@@ -24,7 +24,7 @@
     it 'returns correct value for empty json' do
       allow(object).to receive(:json_field) { {} }
       actual = field.with(bindings).formatted_value
-      expect(actual).to match(/{\n+}/)
+      expect(actual).to match(/{\n*}/)
     end
 
     it 'retuns correct value' do
@@ -72,7 +72,7 @@
     it 'returns correct value for empty json' do
       allow(object).to receive(:json_field) { {} }
       actual = field.with(bindings).export_value
-      expect(actual).to match(/{\n+}/)
+      expect(actual).to match(/{\n*}/)
     end
 
     it 'returns correct value' do