Skip to content

Commit a485fd0

Browse files
petergoldsteinpirj
authored andcommitted
Update requires to avoid pulling in ActiveRecord, fix other require errors
1 parent 2e0ca29 commit a485fd0

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ namespace :no_active_record do
160160
sh "rm -f #{bindir}/rails"
161161
sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap " \
162162
"--skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --skip-spring " \
163-
"--template=example_app_generator/generate_app.rb"
163+
"--skip-action-text --template=example_app_generator/generate_app.rb"
164164

165165
in_example_app(app_dir: example_app_dir) do
166166
sh "./ci_retry_bundle_install.sh 2>&1"

example_app_generator/no_active_record/app/models/in_memory/model.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
raise "ActiveRecord is defined but should not be!" if defined?(::ActiveRecord)
22

3+
require 'active_model'
4+
35
module InMemory
46
module Persistence
57
def all

example_app_generator/spec/support/default_preview_path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require_file_stub 'config/environment' do
2828
require "action_view/railtie"
2929
if Rails::VERSION::STRING >= '6'
3030
require "action_cable/engine"
31-
require "action_mailbox/engine"
31+
require "active_job/railtie"
3232
end
3333

3434
# Require the gems listed in Gemfile, including any gems

0 commit comments

Comments
 (0)