diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-01-03 20:47:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 20:47:05 -0500 |
commit | c1b8d0d94efd1ff54641c27a3f919f12935e418d (patch) | |
tree | b1c5bde4f6018521647fa7e216a24f88e10a6e77 | |
parent | 35404ae046b49705c412920917f92f2adbec5f59 (diff) | |
parent | a7cb2f9638e9ad350d43792afad2d9599e277c12 (diff) | |
download | rails-c1b8d0d94efd1ff54641c27a3f919f12935e418d.tar.gz rails-c1b8d0d94efd1ff54641c27a3f919f12935e418d.tar.bz2 rails-c1b8d0d94efd1ff54641c27a3f919f12935e418d.zip |
Merge pull request #27563 from kamipo/fix_typo
Fix typo s/permited/permitted/
-rw-r--r-- | actionview/test/template/url_helper_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb index 1e64385b52..137eaba5a6 100644 --- a/actionview/test/template/url_helper_test.rb +++ b/actionview/test/template/url_helper_test.rb @@ -235,14 +235,14 @@ class UrlHelperTest < ActiveSupport::TestCase end end - def test_button_to_with_permited_strong_params + def test_button_to_with_permitted_strong_params assert_dom_equal( %{<form action="http://www.example.com" class="button_to" method="post"><input type="submit" value="Hello" /><input type="hidden" name="baz" value="quux" /><input type="hidden" name="foo" value="bar" /></form>}, button_to("Hello", "http://www.example.com", params: FakeParams.new) ) end - def test_button_to_with_unpermited_strong_params + def test_button_to_with_unpermitted_strong_params assert_raises(ArgumentError) do button_to("Hello", "http://www.example.com", params: FakeParams.new(false)) end 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") |