Skip to content

Fix autoload error #1571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2016
Merged

Fix autoload error #1571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example_app_generator/generate_action_mailer_specs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def comment_lines(path, flag, *args)
end
end

if defined?(ActionMailer)
if defined?(ActionMailer) && Rails::VERSION::MAJOR < 4
# This will force the loading of ActionMailer settings
ActionMailer::Base.smtp_settings
end
Expand Down
2 changes: 1 addition & 1 deletion example_app_generator/spec/support/default_preview_path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require_file_stub 'config/environment' do
module ExampleApp
class Application < Rails::Application
config.eager_load = false
config.eager_load_paths.clear
config.eager_load_paths.clear if Rails::VERSION::MAJOR < 4

# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false unless ENV['NO_ACTION_MAILER']
Expand Down