aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-12 18:08:41 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-05-12 18:08:41 -0700
commit84908bbde97ef70b09aca4937793052422bc06ed (patch)
tree48bc00a262397f38317e1e5c430434fde3ac9492 /actionview
parent325c9d5e5235db4b5210d9db6c863835d1ac7eed (diff)
downloadrails-84908bbde97ef70b09aca4937793052422bc06ed.tar.gz
rails-84908bbde97ef70b09aca4937793052422bc06ed.tar.bz2
rails-84908bbde97ef70b09aca4937793052422bc06ed.zip
fix bad merge
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/activerecord/polymorphic_routes_test.rb15
1 files changed, 0 insertions, 15 deletions
diff --git a/actionview/test/activerecord/polymorphic_routes_test.rb b/actionview/test/activerecord/polymorphic_routes_test.rb
index f6ff3069f8..fef27ef492 100644
--- a/actionview/test/activerecord/polymorphic_routes_test.rb
+++ b/actionview/test/activerecord/polymorphic_routes_test.rb
@@ -242,21 +242,6 @@ class PolymorphicRoutesTest < ActionController::TestCase
end
end
- def test_new_record_arguments
- params = nil
- extend Module.new {
- define_method("projects_url") { |*args|
- params = args
- super(*args)
- }
- }
-
- with_test_routes do
- assert_equal "http://example.com/projects", polymorphic_url(@project)
- assert_equal [], params
- end
- end
-
def test_with_destroyed_record
with_test_routes do
@project.destroy