aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/test_test.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-21 11:27:23 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-21 11:27:23 -0300
commitf32c3709830eb8d9f68a59c94f6791621c2b52ac (patch)
treeb34cf0b9321dfd40b795cc761b158be4cbde48f6 /actionpack/test/template/test_test.rb
parent9a28bd787660b08aae36155066e61d3608d0b4dd (diff)
parent9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff)
downloadrails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.gz
rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.bz2
rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/template/test_test.rb')
-rw-r--r--actionpack/test/template/test_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index 98307fbae4..f32d0b3d42 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -41,7 +41,7 @@ class PeopleHelperTest < ActionView::TestCase
def test_link_to_person
person = mock(:name => "David")
- person.class.extend ActiveModel::APICompliant
+ person.class.extend ActiveModel::Naming
expects(:mocha_mock_path).with(person).returns("/people/1")
assert_equal '<a href="/people/1">David</a>', link_to_person(person)
end