From 6750252e2ec6f8c2e89d7f67426bddb0633768b0 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 20 May 2024 13:47:08 +0930 Subject: [PATCH] Minor fixes to spec setup --- Gemfile | 3 +-- spec/dummy/config/application.rb | 11 +---------- spec/dummy/config/initializers/devise.rb | 1 + spec/rails_helper.rb | 3 --- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 929cc00..9301e72 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,7 @@ group :test do gem "devise" end +gem "rails", "~> 7.1.0" gem "sassc-rails" -gem "rake", "~> 12.0" - gem "trestle", github: "TrestleAdmin/trestle" diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 90bd538..6b1b09c 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -17,16 +17,7 @@ module Dummy class Application < Rails::Application # Initialize configuration defaults for current Rails version. - case Rails.version.split(".").first(2).join(".") - when '7.1' - config.load_defaults 7.1 - when '7.0' - config.load_defaults 7.0 - when '6.0' - config.load_defaults 6.0 - when '5.2' - config.load_defaults 5.2 - end + config.load_defaults Rails::VERSION::STRING.to_f # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers diff --git a/spec/dummy/config/initializers/devise.rb b/spec/dummy/config/initializers/devise.rb index a9c76b7..fca4386 100644 --- a/spec/dummy/config/initializers/devise.rb +++ b/spec/dummy/config/initializers/devise.rb @@ -11,6 +11,7 @@ # Devise will use the `secret_key_base` as its `secret_key` # by default. You can change it below and use your own secret key. # config.secret_key = '643d9da568171253dab3254fd2e7bd552cc5fbdc41d25a71b94ceb1897c4801bd0ef7fb8a3cdc5ca8c5c2a37d8b9f02c9d330bed3c1cd73027f7f8cfdc9b4477' + config.secret_key = Rails.application.secret_key_base # ==> Controller configuration # Configure the parent class to the devise controllers. diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 9561fab..e737514 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -19,9 +19,6 @@ end RSpec.configure do |config| - # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" - # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false # instead of true.