polymorphic_test.rb in inherited_resources-1.2.0

- old
+ new

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class Factory; end
 class Company; end
 
 class Employee
@@ -21,11 +21,11 @@
     @controller.stubs(:resource_url).returns('/')
     @controller.stubs(:collection_url).returns('/')
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Employee.expects(:find).with(:all).returns([mock_employee])
+    Employee.expects(:all).returns([mock_employee])
     get :index, :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
     assert_equal [mock_employee], assigns(:employees)
   end
 
@@ -75,11 +75,11 @@
   end
 
   def test_polymorphic_helpers
     mock_factory.stubs(:class).returns(Factory)
 
-    Employee.expects(:find).with(:all).returns([mock_employee])
+    Employee.expects(:all).returns([mock_employee])
     get :index, :factory_id => '37'
 
     assert @controller.send(:parent?)
     assert_equal :factory, assigns(:parent_type)
     assert_equal :factory, @controller.send(:parent_type)
@@ -108,11 +108,11 @@
     @controller.stubs(:resource_url).returns('/')
     @controller.stubs(:collection_url).returns('/')
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Employee.expects(:find).with(:all).returns([mock_employee])
+    Employee.expects(:all).returns([mock_employee])
     get :index, :company_id => '37'
     assert_equal mock_company, assigns(:company)
     assert_equal [mock_employee], assigns(:employees)
   end
 
@@ -162,10 +162,10 @@
   end
 
   def test_polymorphic_helpers
     mock_company.stubs(:class).returns(Company)
 
-    Employee.expects(:find).with(:all).returns([mock_employee])
+    Employee.expects(:all).returns([mock_employee])
     get :index, :company_id => '37'
 
     assert @controller.send(:parent?)
     assert_equal :company, assigns(:parent_type)
     assert_equal :company, @controller.send(:parent_type)