aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-08-01 16:59:37 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-08-01 16:59:37 -0500
commite473946d58cfdab0b16cf91cdad6bef23fcfafc3 (patch)
tree8381b3ddd0fca7ef6e9cb7f79aa53a768ecbf376 /activesupport
parent3d3ec20a485a109bb772cb37382040e25f5d0ded (diff)
parentf9a43f28c087f8ffd35ff7c33a60c938b60f2be2 (diff)
downloadrails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.tar.gz
rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.tar.bz2
rails-e473946d58cfdab0b16cf91cdad6bef23fcfafc3.zip
Merge branch 'master' into active-storage-import
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/assertions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index f6366bfd39..e2bc51ff7a 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -157,7 +157,7 @@ module ActiveSupport
after = exp.call
if to == UNTRACKED
- error = "#{expression.inspect} didn't changed"
+ error = "#{expression.inspect} didn't change"
error = "#{message}.\n#{error}" if message
assert_not_equal before, after, error
else