From fdf0f8b21552f19ded444123a174920e93bad822 Mon Sep 17 00:00:00 2001 From: Tomohiro Nishimura Date: Sat, 17 Oct 2020 00:59:58 +0900 Subject: [PATCH 1/3] Simplify rails app generation especially Gemfile for test --- test/support/application_generator.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/support/application_generator.rb b/test/support/application_generator.rb index 1aac0fcb..8dd9d896 100644 --- a/test/support/application_generator.rb +++ b/test/support/application_generator.rb @@ -59,16 +59,12 @@ def generate_files c.gsub!(/(gem '(byebug|web-console|sdoc|jbuilder)')/, "# \\1") if @version.to_s < '5.2' - c.gsub!(/(gem 'sqlite3')/, "# \\1") + c.gsub!(/(gem 'sqlite3')/, "\\1, '< 1.4'") end c end - if @version.to_s < '5.2' - append_to_file(application.gemfile, "gem 'sqlite3', '< 1.4'") - end - rewrite_file(application.path("config/environments/test.rb")) do |c| c.sub!(/config\.cache_classes\s*=\s*true/, "config.cache_classes = false") c From 27e8e1a406595daf6e5feb646a9e11f39421a8e1 Mon Sep 17 00:00:00 2001 From: Tomohiro Nishimura Date: Sat, 17 Oct 2020 02:03:18 +0900 Subject: [PATCH 2/3] Make it work with multiple gem 'sqlite3' --- test/support/acceptance_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/acceptance_test.rb b/test/support/acceptance_test.rb index 889d2c97..dcc4ab6b 100644 --- a/test/support/acceptance_test.rb +++ b/test/support/acceptance_test.rb @@ -510,7 +510,7 @@ def exec_name assert_success %(bin/rails runner 'require "sqlite3"') - File.write(app.gems_rb, app.gems_rb.read.sub(%{gem 'sqlite3'}, %{# gem 'sqlite3'})) + File.write(app.gems_rb, app.gems_rb.read.gsub(%{gem 'sqlite3'}, %{# gem 'sqlite3'})) app.await_reload assert_failure %(bin/rails runner 'require "sqlite3"'), stderr: "sqlite3" From 887d8e25c2e180ce43350a966e95dcf10fb13ecb Mon Sep 17 00:00:00 2001 From: Tomohiro Nishimura Date: Sat, 17 Oct 2020 11:40:55 +0900 Subject: [PATCH 3/3] Support sqlite3 with version for acceptancde test app generation at under Rails 5.1 ex) gem 'sqlite3' #=> gem 'sqlite3', '1.4' gem 'sqlite3', '~> 1.5' #=> gem 'sqlite3', '1.4' --- test/support/application_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/application_generator.rb b/test/support/application_generator.rb index 8dd9d896..d220daff 100644 --- a/test/support/application_generator.rb +++ b/test/support/application_generator.rb @@ -59,7 +59,7 @@ def generate_files c.gsub!(/(gem '(byebug|web-console|sdoc|jbuilder)')/, "# \\1") if @version.to_s < '5.2' - c.gsub!(/(gem 'sqlite3')/, "\\1, '< 1.4'") + c.gsub!(/(gem 'sqlite3').*$/, "\\1, '< 1.4'") end c