Skip to content

Commit

Permalink
WIP lets get the tests running and see what is broken
Browse files Browse the repository at this point in the history
  • Loading branch information
gbp committed Jan 8, 2024
1 parent aa9de04 commit f0d8230
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 2 additions & 3 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class Application < Rails::Application
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")
config.autoloader = :zeitwerk
config.active_record.legacy_connection_handling = false
config.active_support.use_rfc4122_namespaced_uuids = true

# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
Expand Down Expand Up @@ -82,8 +81,6 @@ class Application < Rails::Application
config.autoload_paths << "#{Rails.root}/app/controllers/concerns"
config.autoload_paths << "#{Rails.root}/app/models/concerns"

config.enable_dependency_loading = true

# See Rails::Configuration for more options
ENV['RECAPTCHA_SITE_KEY'] = AlaveteliConfiguration.recaptcha_site_key
ENV['RECAPTCHA_SECRET_KEY'] = AlaveteliConfiguration.recaptcha_secret_key
Expand All @@ -100,5 +97,7 @@ class Application < Rails::Application

# Allow the generation of full URLs in emails
config.action_mailer.default_url_options = { host: AlaveteliConfiguration.domain }

config.active_storage.service = :local
end
end
6 changes: 6 additions & 0 deletions config/storage.yml-example
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,9 @@ attachments_test: &attachments_test

attachments:
<<: *attachments_<%= Rails.env %>

## Local ##

local:
service: Disk
root: <%= Rails.root.join('tmp/storage/local') %>
2 changes: 1 addition & 1 deletion lib/no_constraint_disabling.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module ActiveRecord
class FixtureSet
def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}, config = ActiveRecord::Base)
fixture_set_names = Array(fixture_set_names).map(&:to_s)
class_names = ClassCache.new class_names, config
class_names.stringify_keys!

# FIXME: Apparently JK uses this.
connection = block_given? ? yield : ActiveRecord::Base.connection
Expand Down

0 comments on commit f0d8230

Please sign in to comment.