Use Combustion gem to run tests

n-rodriguez · n-rodriguez · commit e3a798c1dfc5 · 2022-10-26T02:01:00.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -10,11 +10,14 @@
 /coverage
 /tmp
 
-# Ignore sqlite db file
-/ajax_datatables_rails
-
 # RVM files
 /.ruby-version
 
 # Gem files
 /*.gem
+
+# Ignore dummy app files
+spec/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3-journal
+spec/dummy/log/*.log
+spec/dummy/tmp/
diff --git a/Gemfile b/Gemfile
@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git'
+gem 'appraisal', git: 'https://github.com/n-rodriguez/appraisal.git', branch: 'wip/combustion'
diff --git a/ajax-datatables-rails.gemspec b/ajax-datatables-rails.gemspec
@@ -23,21 +23,24 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
+  s.add_runtime_dependency 'rails', '>= 5.2'
   s.add_runtime_dependency 'zeitwerk'
 
   s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'combustion', '~> 1.3'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'faker'
   s.add_development_dependency 'generator_spec'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'pg'
+  s.add_development_dependency 'puma'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rails', '>= 5.2'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-retry'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'sqlite3', '~> 1.4.0'
 end
diff --git a/bin/rackup b/bin/rackup
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rack", "rackup")
diff --git a/config.ru b/config.ru
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Bundler.require :default, :development
+
+Combustion.path = 'spec/dummy'
+Combustion.initialize! :all
+run Combustion::Application
diff --git a/gemfiles/rails_5.2.6.gemfile b/gemfiles/rails_5.2.6.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
 gem "rails", "5.2.6"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
diff --git a/gemfiles/rails_6.0.4.gemfile b/gemfiles/rails_6.0.4.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
 gem "rails", "6.0.4"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
diff --git a/gemfiles/rails_6.1.4.gemfile b/gemfiles/rails_6.1.4.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
 gem "rails", "6.1.4"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
diff --git a/gemfiles/rails_7.0.1.gemfile b/gemfiles/rails_7.0.1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
+gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
 gem "rails", "7.0.1"
 
 install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml
@@ -0,0 +1,25 @@
+<% adapter = ENV.fetch('DB_ADAPTER', 'postgresql') %>
+test:
+  adapter:  <%= adapter %>
+  database: ajax_datatables_rails
+  encoding: utf8
+
+<% if adapter == 'postgresql' %>
+  host: '127.0.0.1'
+  port: 5432
+  username: 'postgres'
+  password: 'postgres'
+<% elsif adapter == 'mysql2' %>
+  host: '127.0.0.1'
+  port: 3306
+  username: 'root'
+  password: 'root'
+<% elsif adapter == 'oracle_enhanced' %>
+  host: '127.0.0.1/xe'
+  username: <%= ENV.fetch('USER') %>
+  password: <%= ENV.fetch('USER') %>
+  database: 'xe'
+<% elsif adapter == 'sqlite3' %>
+  # database: ':memory:'
+  database: db/ajax_datatables_rails.sqlite3
+<% end %>
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+  # Add your own routes here, or remove this file if you don't have need for it.
+end
diff --git a/spec/dummy/config/storage.yml b/spec/dummy/config/storage.yml
@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: /tmp/ajax-datatables-rails/tmp/storage
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 ActiveRecord::Schema.define do
-  self.verbose = false
-
   create_table :users, force: true do |t|
     t.string  :username
     t.string  :email
@@ -12,5 +10,4 @@
 
     t.timestamps null: false
   end
-
 end
diff --git a/spec/dummy/log/.gitignore b/spec/dummy/log/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/spec/dummy/public/favicon.ico b/spec/dummy/public/favicon.ico
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
+require 'combustion'
+
+Combustion.path = 'spec/dummy'
+Combustion.initialize! :active_record, :action_controller
+
 require 'simplecov'
 require 'rspec'
 require 'rspec/retry'
 require 'database_cleaner'
 require 'factory_bot'
 require 'faker'
 require 'pry'
-require 'rails'
-require 'active_record'
-require 'action_controller'
 
 # Start Simplecov
 SimpleCov.start do
@@ -79,30 +81,6 @@ def self.postgresql?
   end
 end
 
-# Configure ActiveRecord
-adapter = ENV.fetch('DB_ADAPTER', 'postgresql')
-ENV['DB_ADAPTER'] = adapter
-
-options = {
-  adapter:  adapter,
-  database: 'ajax_datatables_rails',
-  encoding: 'utf8',
-}
-
-options =
-  case adapter
-  when 'postgresql'
-    options.merge(host: '127.0.0.1', port: 5432, username: 'postgres', password: 'postgres')
-  when 'mysql2'
-    options.merge(host: '127.0.0.1', port: 3306, username: 'root', password: 'root')
-  when 'oracle_enhanced'
-    options.merge(host: '127.0.0.1/xe', username: ENV['USER'], password: ENV['USER'], database: 'xe')
-  when 'sqlite3'
-    options.merge(database: ':memory:')
-  end
-
-ActiveRecord::Base.establish_connection(options)
-
 # Require our gem
 require 'ajax-datatables-rails'
 

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source 'https://rubygems.org'`
`4`	`4`
`5`	`5`	`gemspec`
`6`	`6`
`7`		`-gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git'`
	`7`	`+gem 'appraisal', git: 'https://github.com/n-rodriguez/appraisal.git', branch: 'wip/combustion'`