josevalim-inherited_resources 0.5.2 → 0.6.0

data/test/polymorphic_test.rb

@@ -11,17 +11,18 @@ class EmployeesController < InheritedResources::Base
   belongs_to :factory, :company, :polymorphic => true
 end
 
-class PolymorphicTest < TEST_CLASS
+class PolymorphicFactoriesTest < ActionController::TestCase
+  tests EmployeesController
 
   def setup
-    @controller          = EmployeesController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
+    Factory.expects(:find).with('37').returns(mock_factory)
+    mock_factory.expects(:employees).returns(Employee)
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
   end
 
   def test_expose_all_employees_as_instance_variable_on_index
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:find).with(:all).returns([mock_employee])
     get :index, :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
@@ -29,8 +30,6 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_expose_the_resquested_employee_on_show
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:find).with('42').returns(mock_employee)
     get :show, :id => '42', :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
@@ -38,8 +37,6 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_expose_a_new_employee_on_new
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:build).returns(mock_employee)
     get :new, :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
@@ -47,8 +44,6 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_expose_the_resquested_employee_on_edit
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:find).with('42').returns(mock_employee)
     get :edit, :id => '42', :factory_id => '37'
     assert_equal mock_factory, assigns(:factory)
@@ -57,8 +52,6 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_expose_a_newly_create_employee_on_create
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:build).with({'these' => 'params'}).returns(mock_employee(:save => true))
     post :create, :factory_id => '37', :employee => {:these => 'params'}
     assert_equal mock_factory, assigns(:factory)
@@ -66,8 +59,6 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_update_the_requested_object_on_update
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:find).with('42').returns(mock_employee)
     mock_employee.expects(:update_attributes).with({'these' => 'params'}).returns(true)
     put :update, :id => '42', :factory_id => '37', :employee => {:these => 'params'}
@@ -76,8 +67,6 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_the_resquested_employee_is_destroyed_on_destroy
-    Factory.expects(:find).with('37').returns(mock_factory)
-    mock_factory.expects(:employees).returns(Employee)
     Employee.expects(:find).with('42').returns(mock_employee)
     mock_employee.expects(:destroy)
     delete :destroy, :id => '42', :factory_id => '37'
@@ -86,9 +75,8 @@ class PolymorphicTest < TEST_CLASS
   end
 
   def test_polymorphic_helpers
-    new_factory = Factory.new
-    Factory.expects(:find).with('37').returns(new_factory)
-    new_factory.expects(:employees).returns(Employee)
+    mock_factory.stubs(:class).returns(Factory)
+
     Employee.expects(:find).with(:all).returns([mock_employee])
     get :index, :factory_id => '37'
 
@@ -96,8 +84,8 @@ class PolymorphicTest < TEST_CLASS
     assert_equal :factory, assigns(:parent_type)
     assert_equal :factory, @controller.send(:parent_type)
     assert_equal Factory, @controller.send(:parent_class)
-    assert_equal new_factory, assigns(:factory)
-    assert_equal new_factory, @controller.send(:parent)
+    assert_equal mock_factory, assigns(:factory)
+    assert_equal mock_factory, @controller.send(:parent)
   end
 
   protected
@@ -109,3 +97,90 @@ class PolymorphicTest < TEST_CLASS
       @mock_employee ||= mock(stubs)
     end
 end
+
+class PolymorphicCompanyTest < ActionController::TestCase
+  tests EmployeesController
+
+  def setup
+    Company.expects(:find).with('37').returns(mock_company)
+    mock_company.expects(:employees).returns(Employee)
+
+    @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])
+    get :index, :company_id => '37'
+    assert_equal mock_company, assigns(:company)
+    assert_equal [mock_employee], assigns(:employees)
+  end
+
+  def test_expose_the_resquested_employee_on_show
+    Employee.expects(:find).with('42').returns(mock_employee)
+    get :show, :id => '42', :company_id => '37'
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_expose_a_new_employee_on_new
+    Employee.expects(:build).returns(mock_employee)
+    get :new, :company_id => '37'
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_expose_the_resquested_employee_on_edit
+    Employee.expects(:find).with('42').returns(mock_employee)
+    get :edit, :id => '42', :company_id => '37'
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_employee, assigns(:employee)
+    assert_response :success
+  end
+
+  def test_expose_a_newly_create_employee_on_create
+    Employee.expects(:build).with({'these' => 'params'}).returns(mock_employee(:save => true))
+    post :create, :company_id => '37', :employee => {:these => 'params'}
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_update_the_requested_object_on_update
+    Employee.expects(:find).with('42').returns(mock_employee)
+    mock_employee.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :company_id => '37', :employee => {:these => 'params'}
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_the_resquested_employee_is_destroyed_on_destroy
+    Employee.expects(:find).with('42').returns(mock_employee)
+    mock_employee.expects(:destroy)
+    delete :destroy, :id => '42', :company_id => '37'
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_employee, assigns(:employee)
+  end
+
+  def test_polymorphic_helpers
+    mock_company.stubs(:class).returns(Company)
+
+    Employee.expects(:find).with(: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)
+    assert_equal Company, @controller.send(:parent_class)
+    assert_equal mock_company, assigns(:company)
+    assert_equal mock_company, @controller.send(:parent)
+  end
+
+  protected
+    def mock_company(stubs={})
+      @mock_company ||= mock(stubs)
+    end
+
+    def mock_employee(stubs={})
+      @mock_employee ||= mock(stubs)
+    end
+end

data/test/redirect_to_test.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class Machine;
+  def self.human_name; 'Machine'; end
+end
+
+class MachinesController < InheritedResources::Base
+
+  def create
+    create!('http://test.host/')
+  end
+
+  def update
+    update!('http://test.host/')
+  end
+
+  def destroy
+    destroy!('http://test.host/')
+  end
+
+end
+
+class RedirectToTest < ActionController::TestCase
+  tests MachinesController
+
+  def test_redirect_to_the_given_url_on_create
+    Machine.stubs(:new).returns(mock_machine(:save => true))
+    @controller.expects(:resource_url).times(0)
+    post :create
+    assert_redirected_to 'http://test.host/'
+  end
+
+  def test_redirect_to_the_given_url_on_update
+    Machine.stubs(:find).returns(mock_machine(:update_attributes => true))
+    @controller.expects(:resource_url).times(0)
+    put :update
+    assert_redirected_to 'http://test.host/'
+  end
+
+  def test_redirect_to_the_given_url_on_destroy
+    Machine.stubs(:find).returns(mock_machine(:destroy => true))
+    @controller.expects(:collection_url).times(0)
+    put :destroy
+    assert_redirected_to 'http://test.host/'
+  end
+
+  protected
+    def mock_machine(stubs={})
+      @mock_machine ||= mock(stubs)
+    end
+end
+

data/test/respond_to_test.rb

@@ -17,7 +17,7 @@ end
 class ProjectsController < ActionController::Base
   # Inherited respond_to definition is:
   # respond_to :html
-  # respond_to :xml, :except => :edit
+  respond_to :xml, :except => :edit
   respond_to :html
   respond_to :rjs => :edit
   respond_to :rss,  :only => 'index'
@@ -51,14 +51,12 @@ end
 class SuperProjectsController < ProjectsController
 end
 
-class RespondToUnitTest < TEST_CLASS
-  def setup(class_controller = ProjectsController)
-    @controller          = class_controller.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
+class RespondToUnitTest < ActionController::TestCase
+  tests ProjectsController
 
-    @formats    = @controller.formats_for_respond_to
-    @responder  = ActionController::MimeResponds::Responder.new(@controller)
+  def setup
+    @formats   = @controller.formats_for_respond_to
+    @responder = ActionController::MimeResponds::Responder.new(@controller)
   end
 
   def test_respond_to_class_method_without_options
@@ -109,10 +107,13 @@ class RespondToUnitTest < TEST_CLASS
   end
 
   def test_clear_respond_to
-    setup(SuperProjectsController)
+    @controller = SuperProjectsController.new
+    @controller.request  = ActionController::TestRequest.new
 
-    # Those responses are inherited from ProjectsController
     @controller.action_name = 'index'
+    @responder = ActionController::MimeResponds::Responder.new(@controller)
+
+    # Those responses are inherited from ProjectsController
     assert @responder.action_respond_to_format?('html')  # defined
     assert @responder.action_respond_to_format?('xml')   # inherited
     assert @responder.action_respond_to_format?('rss')   # explicit only
@@ -125,35 +126,35 @@ class RespondToUnitTest < TEST_CLASS
     assert !@responder.action_respond_to_format?('rss')
   end
 
-  def test_respond_to_block_does_not_respond_to_mime_all
+  def test_respond_except_any_does_not_respond_to_mime_all
     prepare_responder_to_respond!
 
-    @responder.respond_to_block
+    @responder.respond_except_any
     assert !@performed
-    assert !@responder.responded?
 
     @responder.respond
     assert @performed
   end
 
-  def test_respond_to_all_responds_to_mime_all
+  def test_respond_any_responds_to_mime_all
     prepare_responder_to_respond!
 
-    @responder.respond_to_all
+    @responder.respond_any
     assert @performed
-    assert @responder.responded?
   end
 
-  def test_respond_to_all_responds_only_to_all
+  def test_respond_any_responds_only_to_all
     prepare_responder_to_respond!('text/html')
 
-    @responder.respond_to_all
+    @responder.respond_any
     assert !@performed
-    assert !@responder.responded?
   end
  
   protected 
-    def prepare_responder_to_respond!(content_type = '*/*')
+    def prepare_responder_to_respond!(content_type='*/*')
+      @controller.request  = @request  = ActionController::TestRequest.new
+      @controller.response = @response = ActionController::TestResponse.new
+
       @request.accept = content_type
       @responder  = ActionController::MimeResponds::Responder.new(@controller)
       @performed = false
@@ -172,12 +173,8 @@ class RespondToUnitTest < TEST_CLASS
     end
 end
 
-class RespondToFunctionalTest < TEST_CLASS
-  def setup
-    @controller          = ProjectsController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
-  end
+class RespondToFunctionalTest < ActionController::TestCase
+  tests ProjectsController
 
   def test_respond_with_layout_rendering
     @request.accept = 'text/html'

data/test/singleton_test.rb

@@ -14,12 +14,12 @@ class ManagersController < InheritedResources::Base
   belongs_to :store, :singleton => true
 end
 
-class SingletonTest < TEST_CLASS
+class SingletonTest < ActionController::TestCase
+  tests ManagersController
 
   def setup
-    @controller          = ManagersController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
   end
 
   def test_expose_the_resquested_manager_on_show

data/test/test_helper.rb

@@ -4,18 +4,11 @@ require 'mocha'
 
 ENV["RAILS_ENV"] = "test"
 
-# Used to tests Rails 2.2.2 version
-# gem 'activesupport', '2.2.2'
-# gem 'actionpack', '2.2.2'
-# TEST_CLASS = Test::Unit::TestCase
-
 require 'active_support'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_controller/test_process'
 
-TEST_CLASS = ActionController::TestCase
-
 I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
 I18n.reload!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -07:00
+date: 2009-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -75,6 +75,7 @@ test_files:
 - test/nested_belongs_to_test.rb
 - test/optional_belongs_to_test.rb
 - test/polymorphic_test.rb
+- test/redirect_to_test.rb
 - test/respond_to_test.rb
 - test/singleton_test.rb
 - test/test_helper.rb