- fix issue with rails and newest sqlite by forcing the 1.4 branch

- move from dummy test app to combustion gem
marcinruszkiewicz · Jun 4, 2024 · 9aaea78 · 9aaea78
1 parent 4a0c889
commit 9aaea78
Show file tree

Hide file tree

Showing 56 changed files with 92 additions and 804 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,7 @@
 .bundle/
 log/*.log
 pkg/
-spec/dummy/db/*.sqlite3
-spec/dummy/db/*.sqlite3-journal
-spec/dummy/log/*.log
-spec/dummy/tmp/
+spec/internal/db/*
+!spec/internal/db/schema.rb
+spec/internal/log/*.log
 gemfiles/*.lock
diff --git a/Appraisals b/Appraisals
@@ -2,16 +2,20 @@
 
 appraise '5.2' do
   gem 'rails', '~> 5.2.0'
+  gem 'sqlite3', '~> 1.4'
 end
 
 appraise '6.0' do
   gem 'rails', '~> 6.0.0'
+  gem 'sqlite3', '~> 1.4'
 end
 
 appraise '6.1' do
   gem 'rails', '~> 6.1.0'
+  gem 'sqlite3', '~> 1.4'
 end
 
 appraise '7.0' do
   gem 'rails', '~> 7.0.0'
+  gem 'sqlite3', '~> 1.4'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,29 +7,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.1.3.3)
-      activesupport (= 7.1.3.3)
-    activerecord (7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -48,15 +48,13 @@ GEM
     bigdecimal (3.1.8)
     builder (3.2.4)
     coderay (1.1.3)
+    combustion (1.4.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
     concurrent-ruby (1.3.1)
     connection_pool (2.4.1)
     crass (1.0.6)
-    database_cleaner (2.0.2)
-      database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
     diff-lcs (1.5.1)
     drb (2.2.1)
     erubi (1.12.0)
@@ -118,9 +116,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -168,16 +166,12 @@ GEM
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    sqlite3 (2.0.2-aarch64-linux-gnu)
-    sqlite3 (2.0.2-aarch64-linux-musl)
-    sqlite3 (2.0.2-arm-linux-gnu)
-    sqlite3 (2.0.2-arm-linux-musl)
-    sqlite3 (2.0.2-arm64-darwin)
-    sqlite3 (2.0.2-x86-linux-gnu)
-    sqlite3 (2.0.2-x86-linux-musl)
-    sqlite3 (2.0.2-x86_64-darwin)
-    sqlite3 (2.0.2-x86_64-linux-gnu)
-    sqlite3 (2.0.2-x86_64-linux-musl)
+    sqlite3 (1.7.3-aarch64-linux)
+    sqlite3 (1.7.3-arm-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86-linux)
+    sqlite3 (1.7.3-x86_64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
     stringio (3.1.0)
     strscan (3.1.0)
     thor (1.3.1)
@@ -206,13 +200,13 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  database_cleaner
+  combustion (~> 1.4)
   factory_bot_rails
   pry-rails
   rspec-rails
   rspec_junit_formatter
   rubocop
-  sqlite3
+  sqlite3 (~> 1.4)
   where_chain!
 
 BUNDLED WITH

diff --git a/config.ru b/config.ru
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application
diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/spec/dummy/Rakefile b/spec/dummy/Rakefile
diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb
diff --git a/spec/dummy/app/mailers/application_mailer.rb b/spec/dummy/app/mailers/application_mailer.rb
diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb
diff --git a/spec/dummy/bin/bundle b/spec/dummy/bin/bundle
diff --git a/spec/dummy/bin/rails b/spec/dummy/bin/rails
diff --git a/spec/dummy/bin/rake b/spec/dummy/bin/rake
diff --git a/spec/dummy/bin/setup b/spec/dummy/bin/setup
diff --git a/spec/dummy/bin/update b/spec/dummy/bin/update
diff --git a/spec/dummy/bin/yarn b/spec/dummy/bin/yarn
diff --git a/spec/dummy/config.ru b/spec/dummy/config.ru
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb
diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml