From 8584199720627862f1055e26b5ef69e4de1c0f4c Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 5 Sep 2024 12:56:17 +0100 Subject: [PATCH 1/3] Set no active record for generator via flag --- Rakefile | 2 +- example_app_generator/generate_stuff.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index da1a6fc94..b0bceaacc 100644 --- a/Rakefile +++ b/Rakefile @@ -188,7 +188,7 @@ namespace :no_active_record do desc "generate a bunch of stuff with generators" task :stuff do - in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'", app_dir: example_app_dir + in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb' __RSPEC_NO_AR=true", app_dir: example_app_dir end end end diff --git a/example_app_generator/generate_stuff.rb b/example_app_generator/generate_stuff.rb index 57e2f705d..77d5a3ef9 100644 --- a/example_app_generator/generate_stuff.rb +++ b/example_app_generator/generate_stuff.rb @@ -57,10 +57,10 @@ def skip_active_record? end def self.environment_hooks - if defined?(ActiveRecord) - AR - else + if ENV['__RSPEC_NO_AR'] NoAR + else + AR end end end From ccc5b64bcceff91bb9826031dcca278bb82ffaaf Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 5 Sep 2024 13:00:27 +0100 Subject: [PATCH 2/3] Skip solid cache as it requires active record --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index b0bceaacc..6fcef11e2 100644 --- a/Rakefile +++ b/Rakefile @@ -165,7 +165,7 @@ namespace :no_active_record do sh "rm -f #{bindir}/rails" sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap " \ "--skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --skip-spring " \ - "--skip-action-text --template=example_app_generator/generate_app.rb" + "--skip-action-text --skip-solid --template=example_app_generator/generate_app.rb" in_example_app(app_dir: example_app_dir) do sh "./ci_retry_bundle_install.sh 2>&1" From c1ccbebe5d372e44962cc712ac722e09dd24757d Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 5 Sep 2024 13:19:10 +0100 Subject: [PATCH 3/3] Helpers to run routes in example apps for debugging --- Rakefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Rakefile b/Rakefile index 6fcef11e2..35aac1bdf 100644 --- a/Rakefile +++ b/Rakefile @@ -105,6 +105,11 @@ namespace :smoke do in_example_app args.cmd.to_s end + desc "run rake routes in example app" + task :routes do + in_example_app "bin/rails routes" + end + desc "run RSPEC_OPTS environment variable in the example app for local dev" task :rspec do in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rspec #{ENV.fetch("RSPEC_OPTS")}" @@ -144,6 +149,11 @@ namespace :no_active_record do "no_active_record:smoke", ] + desc "run rake routes in example app" + task :routes do + in_example_app "bin/rails routes", app_dir: example_app_dir + end + desc "run RSPEC_OPTS environment variable in the example app for local dev" task :rspec do in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rspec #{ENV.fetch("RSPEC_OPTS")}", app_dir: example_app_dir