aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-01-03 20:47:05 -0500
committerGitHub <noreply@github.com>2017-01-03 20:47:05 -0500
commitc1b8d0d94efd1ff54641c27a3f919f12935e418d (patch)
treeb1c5bde4f6018521647fa7e216a24f88e10a6e77 /activerecord
parent35404ae046b49705c412920917f92f2adbec5f59 (diff)
parenta7cb2f9638e9ad350d43792afad2d9599e277c12 (diff)
downloadrails-c1b8d0d94efd1ff54641c27a3f919f12935e418d.tar.gz
rails-c1b8d0d94efd1ff54641c27a3f919f12935e418d.tar.bz2
rails-c1b8d0d94efd1ff54641c27a3f919f12935e418d.zip
Merge pull request #27563 from kamipo/fix_typo
Fix typo s/permited/permitted/
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 4e7109dec3..0bb793c034 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1617,7 +1617,7 @@ class RelationTest < ActiveRecord::TestCase
assert_equal "David", topic2.reload.author_name
end
- def test_update_on_relation_passing_active_record_object_is_not_permited
+ def test_update_on_relation_passing_active_record_object_is_not_permitted
topic = Topic.create!(title: "Foo", author_name: nil)
assert_raises(ArgumentError) do
Topic.where(id: topic.id).update(topic, title: "Bar")