diff --git a/lib/rails/secrets/railtie.rb b/lib/rails/secrets/railtie.rb index 1a0765e..4913d55 100644 --- a/lib/rails/secrets/railtie.rb +++ b/lib/rails/secrets/railtie.rb @@ -29,6 +29,7 @@ class Railtie < ::Rails::Railtie if app.secrets.secret_key_base.blank? raise "Missing `secret_key_base` for '#{Rails.env}' environment, set this value in `config/secrets.yml`" else + app.config.secret_token = app.secrets.secret_key_base app.config.secret_key_base = app.secrets.secret_key_base end end diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb new file mode 100644 index 0000000..d83690e --- /dev/null +++ b/test/dummy/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +end diff --git a/test/dummy/app/controllers/welcome_controller.rb b/test/dummy/app/controllers/welcome_controller.rb new file mode 100644 index 0000000..818db69 --- /dev/null +++ b/test/dummy/app/controllers/welcome_controller.rb @@ -0,0 +1,7 @@ +class WelcomeController < ApplicationController + + def index + render text: 'Welcome' + end + +end diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 60a8916..bd3f2dc 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -1,6 +1,12 @@ require File.expand_path('../boot', __FILE__) -require "rails/all" +require "active_model/railtie" +# require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "sprockets/railtie" +require "rails/test_unit/railtie" Bundler.require(*Rails.groups) diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb new file mode 100644 index 0000000..b01b75f --- /dev/null +++ b/test/dummy/config/routes.rb @@ -0,0 +1,3 @@ +Dummy::Application.routes.draw do + root :to => "welcome#index" +end diff --git a/test/rails_secrets_integration_test.rb b/test/rails_secrets_integration_test.rb new file mode 100644 index 0000000..99ad2b9 --- /dev/null +++ b/test/rails_secrets_integration_test.rb @@ -0,0 +1,10 @@ +require 'test_helper' + +class RailsSecretsIntegrationTest < ActionDispatch::IntegrationTest + + test "load root page" do + get '/' + assert_response :success + end + +end diff --git a/test/rails_secrets_test.rb b/test/rails_secrets_test.rb index 62347f6..ba2c2b6 100644 --- a/test/rails_secrets_test.rb +++ b/test/rails_secrets_test.rb @@ -1,6 +1,4 @@ -ENV["RAILS_ENV"] ||= 'test' -require File.expand_path('../dummy/config/environment', __FILE__) -require 'minitest/autorun' +require 'test_helper' class RailsSecretsTest < ActiveSupport::TestCase @@ -22,4 +20,4 @@ def app Rails.application end -end \ No newline at end of file +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000..da74613 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,3 @@ +ENV["RAILS_ENV"] ||= 'test' +require File.expand_path('../dummy/config/environment', __FILE__) +require 'minitest/autorun'