aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2017-01-30 20:16:30 -0500
committerGitHub <noreply@github.com>2017-01-30 20:16:30 -0500
commit543f19626b80e72c543306b6ca67421df3a42d6c (patch)
tree5f1c9ab0575b88f4fdd92949389d82d4cebdd3d0 /railties
parent4e5c2ccc1d97f0c18834f616fc219be6b1531bde (diff)
parentc42bd31977d601a743a154cf5a614459b51a3cb3 (diff)
downloadrails-543f19626b80e72c543306b6ca67421df3a42d6c.tar.gz
rails-543f19626b80e72c543306b6ca67421df3a42d6c.tar.bz2
rails-543f19626b80e72c543306b6ca67421df3a42d6c.zip
Merge pull request #27797 from y-yagi/correctly_check_error_message
correctly check error message
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/configuration_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 01a9807b6b..824831155e 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -623,9 +623,10 @@ module ApplicationTests
assert_equal "", app.config.secret_token
assert_nil app.secrets.secret_key_base
- assert_raise ArgumentError, /\AA secret is required/ do
+ e = assert_raise ArgumentError do
app.key_generator
end
+ assert_match(/\AA secret is required/, e.message)
end
test "that nested keys are symbolized the same as parents for hashes more than one level deep" do
@@ -1184,11 +1185,12 @@ module ApplicationTests
end
test "config.session_store with :active_record_store without activerecord-session_store gem" do
- assert_raise RuntimeError, /activerecord-session_store/ do
+ e = assert_raise RuntimeError do
make_basic_app do |application|
application.config.session_store :active_record_store
end
end
+ assert_match(/activerecord-session_store/, e.message)
end
test "default session store initializer does not overwrite the user defined session store even if it is disabled" do