josevalim-inherited_resources 0.5.2 → 0.6.0

data/test/base_test.rb

@@ -1,16 +1,13 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-# This test file is instead to test the how controller flow and actions.
-# This is done using mocks a la rspec.
-#
 class User
   def self.human_name; 'User'; end
 end
 
 class UsersController < InheritedResources::Base
+  respond_to :html, :xml
 end
 
-# Create a TestHelper module with some helpers
 module UserTestHelper
   def setup
     @controller          = UsersController.new
@@ -24,7 +21,7 @@ module UserTestHelper
     end
 end
 
-class IndexActionBaseTest < TEST_CLASS
+class IndexActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_expose_all_users_as_instance_variable
@@ -50,7 +47,7 @@ class IndexActionBaseTest < TEST_CLASS
   end
 end
 
-class ShowActionBaseTest < TEST_CLASS
+class ShowActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_expose_the_resquested_user
@@ -76,7 +73,7 @@ class ShowActionBaseTest < TEST_CLASS
   end
 end
 
-class NewActionBaseTest < TEST_CLASS
+class NewActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_expose_a_new_user
@@ -102,7 +99,7 @@ class NewActionBaseTest < TEST_CLASS
   end
 end
 
-class EditActionBaseTest < TEST_CLASS
+class EditActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_expose_the_resquested_user
@@ -120,7 +117,7 @@ class EditActionBaseTest < TEST_CLASS
   end
 end
 
-class CreateActionBaseTest < TEST_CLASS
+class CreateActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_expose_a_newly_create_user_when_saved_with_success
@@ -156,7 +153,7 @@ class CreateActionBaseTest < TEST_CLASS
   end
 end
 
-class UpdateActionBaseTest < TEST_CLASS
+class UpdateActionBaseTest < ActionController::TestCase
   include UserTestHelper
 
   def test_update_the_requested_object
@@ -193,7 +190,7 @@ class UpdateActionBaseTest < TEST_CLASS
   end
 end
 
-class DestroyActionBaseTest < TEST_CLASS
+class DestroyActionBaseTest < ActionController::TestCase
   include UserTestHelper
   
   def test_the_resquested_user_is_destroyed

data/test/belongs_to_test.rb

@@ -1,8 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-# This test file is instead to test the how controller flow and actions
-# using a belongs_to association. This is done using mocks a la rspec.
-#
 class Post
 end
 
@@ -14,17 +11,18 @@ class CommentsController < InheritedResources::Base
   belongs_to :post
 end
 
-class BelongsToTest < TEST_CLASS
+class BelongsToTest < ActionController::TestCase
+  tests CommentsController
 
   def setup
-    @controller          = CommentsController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
+    Post.expects(:find).with('37').returns(mock_post)
+    mock_post.expects(:comments).returns(Comment)
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
   end
 
   def test_expose_all_comments_as_instance_variable_on_index
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:find).with(:all).returns([mock_comment])
     get :index, :post_id => '37'
     assert_equal mock_post, assigns(:post)
@@ -32,8 +30,6 @@ class BelongsToTest < TEST_CLASS
   end
 
   def test_expose_the_resquested_comment_on_show
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:find).with('42').returns(mock_comment)
     get :show, :id => '42', :post_id => '37'
     assert_equal mock_post, assigns(:post)
@@ -41,8 +37,6 @@ class BelongsToTest < TEST_CLASS
   end
 
   def test_expose_a_new_comment_on_new
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:build).returns(mock_comment)
     get :new, :post_id => '37'
     assert_equal mock_post, assigns(:post)
@@ -50,8 +44,6 @@ class BelongsToTest < TEST_CLASS
   end
 
   def test_expose_the_resquested_comment_on_edit
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:find).with('42').returns(mock_comment)
     get :edit, :id => '42', :post_id => '37'
     assert_equal mock_post, assigns(:post)
@@ -59,8 +51,6 @@ class BelongsToTest < TEST_CLASS
   end
 
   def test_expose_a_newly_create_comment_on_create
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:build).with({'these' => 'params'}).returns(mock_comment(:save => true))
     post :create, :post_id => '37', :comment => {:these => 'params'}
     assert_equal mock_post, assigns(:post)
@@ -68,8 +58,6 @@ class BelongsToTest < TEST_CLASS
   end
 
   def test_update_the_requested_object_on_update
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:find).with('42').returns(mock_comment)
     mock_comment.expects(:update_attributes).with({'these' => 'params'}).returns(true)
     put :update, :id => '42', :post_id => '37', :comment => {:these => 'params'}
@@ -78,15 +66,15 @@ class BelongsToTest < TEST_CLASS
   end
 
   def test_the_resquested_comment_is_destroyed_on_destroy
-    Post.expects(:find).with('37').returns(mock_post)
-    mock_post.expects(:comments).returns(Comment)
     Comment.expects(:find).with('42').returns(mock_comment)
     mock_comment.expects(:destroy)
     delete :destroy, :id => '42', :post_id => '37'
     assert_equal mock_post, assigns(:post)
     assert_equal mock_comment, assigns(:comment)
   end
+
   protected
+
     def mock_post(stubs={})
       @mock_post ||= mock(stubs)
     end

data/test/class_methods_test.rb

@@ -93,62 +93,70 @@ class DefaultsClassMethodTest < ActiveSupport::TestCase
 end
 
 
-class BelongsToClassMethodTest < TEST_CLASS
+class BelongsToClassMethodTest < ActionController::TestCase
+  tests ProfessorsController
+
   def setup
-    @controller          = ProfessorsController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
+    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_index
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns([mock_professor])
     get :index, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_show
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor)
     get :show, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_new
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:build).returns(mock_professor)
     get :new, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_edit
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor)
     get :edit, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_create
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:build).returns(mock_professor(:save => true))
     post :create, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_update
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor(:update_attributes => true))
     put :update, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
   def test_expose_the_resquested_school_with_chosen_instance_variable_on_destroy
-    GreatSchool.expects(:find_by_title!).with('nice').returns(mock_school(:professors => Professor))
     Professor.stubs(:find).returns(mock_professor(:destroy => true))
     delete :destroy, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end
 
+  protected
+
+    def mock_school(stubs={})
+      @mock_school ||= mock(stubs)
+    end
+
+    def mock_professor(stubs={})
+      @mock_professor ||= mock(stubs)
+    end
+end
+
+class BelongsToErrorsTest < ActiveSupport::TestCase
   def test_belongs_to_raise_errors_with_invalid_arguments
     assert_raise ArgumentError do
       ProfessorsController.send(:belongs_to)
@@ -167,16 +175,7 @@ class BelongsToClassMethodTest < TEST_CLASS
     InheritedResources::UrlHelpers.expects(:create_resources_url_helpers!).returns(true).once
     ProfessorsController.send(:defaults, BELONGS_TO_OPTIONS)
   ensure
-    # Reestore default settings
+    # Restore default settings
     ProfessorsController.send(:parents_symbols=, [:school])
   end
-
-  protected
-    def mock_school(stubs={})
-      @mock_school ||= mock(stubs)
-    end
-
-    def mock_professor(stubs={})
-      @mock_professor ||= mock(stubs)
-    end
 end

data/test/defaults_test.rb

@@ -8,11 +8,12 @@ class PaintersController < InheritedResources::Base
   defaults :instance_name => 'malarz', :collection_name => 'malarze', :resource_class => Malarz
 end
 
-class DefaultsTest < TEST_CLASS
+class DefaultsTest < ActionController::TestCase
+  tests PaintersController
+
   def setup
-    @controller          = PaintersController.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_all_painters_as_instance_variable

data/test/nested_belongs_to_test.rb

@@ -14,22 +14,21 @@ class CitiesController < InheritedResources::Base
   belongs_to :country, :state
 end
 
-# Create a TestHelper module with some helpers
-class NestedBelongsToTest < TEST_CLASS
+class NestedBelongsToTest < ActionController::TestCase
+  tests CitiesController
 
   def setup
-    @controller          = CitiesController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
-  end
-
-  def test_assigns_country_and_state_and_city_on_create
     Country.expects(:find).with('13').returns(mock_country)
     mock_country.expects(:states).returns(State)
     State.expects(:find).with('37').returns(mock_state)
     mock_state.expects(:cities).returns(City)
-    City.expects(:find).with(:all).returns([mock_city])
 
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_assigns_country_and_state_and_city_on_create
+    City.expects(:find).with(:all).returns([mock_city])
     get :index, :state_id => '37', :country_id => '13'
 
     assert_equal mock_country, assigns(:country)
@@ -38,12 +37,7 @@ class NestedBelongsToTest < TEST_CLASS
   end
 
   def test_assigns_country_and_state_and_city_on_show
-    Country.expects(:find).with('13').returns(mock_country)
-    mock_country.expects(:states).returns(State)
-    State.expects(:find).with('37').returns(mock_state)
-    mock_state.expects(:cities).returns(City)
     City.expects(:find).with('42').returns(mock_city)
-
     get :show, :id => '42', :state_id => '37', :country_id => '13'
 
     assert_equal mock_country, assigns(:country)
@@ -52,12 +46,7 @@ class NestedBelongsToTest < TEST_CLASS
   end
 
   def test_assigns_country_and_state_and_city_on_new
-    Country.expects(:find).with('13').returns(mock_country)
-    mock_country.expects(:states).returns(State)
-    State.expects(:find).with('37').returns(mock_state)
-    mock_state.expects(:cities).returns(City)
     City.expects(:build).returns(mock_city)
-
     get :new, :state_id => '37', :country_id => '13'
 
     assert_equal mock_country, assigns(:country)
@@ -66,12 +55,7 @@ class NestedBelongsToTest < TEST_CLASS
   end
 
   def test_assigns_country_and_state_and_city_on_edit
-    Country.expects(:find).with('13').returns(mock_country)
-    mock_country.expects(:states).returns(State)
-    State.expects(:find).with('37').returns(mock_state)
-    mock_state.expects(:cities).returns(City)
     City.expects(:find).with('42').returns(mock_city)
-
     get :edit, :id => '42', :state_id => '37', :country_id => '13'
 
     assert_equal mock_country, assigns(:country)
@@ -80,12 +64,8 @@ class NestedBelongsToTest < TEST_CLASS
   end
 
   def test_assigns_country_and_state_and_city_on_create
-    Country.expects(:find).with('13').returns(mock_country)
-    mock_country.expects(:states).returns(State)
-    State.expects(:find).with('37').returns(mock_state)
-    mock_state.expects(:cities).returns(City)
-    City.expects(:build).with({'these' => 'params'}).returns(mock_city(:save => true))
-
+    City.expects(:build).with({'these' => 'params'}).returns(mock_city)
+    mock_city.expects(:save).returns(true)
     post :create, :state_id => '37', :country_id => '13', :city => {:these => 'params'}
 
     assert_equal mock_country, assigns(:country)
@@ -94,13 +74,8 @@ class NestedBelongsToTest < TEST_CLASS
   end
 
   def test_assigns_country_and_state_and_city_on_update
-    Country.expects(:find).with('13').returns(mock_country)
-    mock_country.expects(:states).returns(State)
-    State.expects(:find).with('37').returns(mock_state)
-    mock_state.expects(:cities).returns(City)
     City.expects(:find).with('42').returns(mock_city)
-    mock_city.expects(:update_attributes).with({'these' => 'params'}).returns(true)
-
+    mock_city.expects(:update_attributes).returns(true)
     put :update, :id => '42', :state_id => '37', :country_id => '13', :city => {:these => 'params'}
 
     assert_equal mock_country, assigns(:country)
@@ -109,13 +84,8 @@ class NestedBelongsToTest < TEST_CLASS
   end
   
   def test_assigns_country_and_state_and_city_on_destroy
-    Country.expects(:find).with('13').returns(mock_country)
-    mock_country.expects(:states).returns(State)
-    State.expects(:find).with('37').returns(mock_state)
-    mock_state.expects(:cities).returns(City)
     City.expects(:find).with('42').returns(mock_city)
     mock_city.expects(:destroy)
-
     delete :destroy, :id => '42', :state_id => '37', :country_id => '13'
 
     assert_equal mock_country, assigns(:country)

data/test/optional_belongs_to_test.rb

@@ -11,27 +11,14 @@ class ProductsController < InheritedResources::Base
   belongs_to :brand, :category, :polymorphic => true, :optional => true
 end
 
-# Create a TestHelper module with some helpers
-module ProductTestHelper
+class OptionalTest < ActionController::TestCase
+  tests ProductsController
+
   def setup
-    @controller          = ProductsController.new
-    @controller.request  = @request  = ActionController::TestRequest.new
-    @controller.response = @response = ActionController::TestResponse.new
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
   end
 
-  protected
-    def mock_category(stubs={})
-      @mock_category ||= mock(stubs)
-    end
-
-    def mock_product(stubs={})
-      @mock_product ||= mock(stubs)
-    end
-end
-
-class IndexActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
-
   def test_expose_all_products_as_instance_variable_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
@@ -47,10 +34,6 @@ class IndexActionOptionalTest < TEST_CLASS
     assert_equal nil, assigns(:category)
     assert_equal [mock_product], assigns(:products)
   end
-end
-
-class ShowActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
 
   def test_expose_the_resquested_product_with_category
     Category.expects(:find).with('37').returns(mock_category)
@@ -67,10 +50,6 @@ class ShowActionOptionalTest < TEST_CLASS
     assert_equal nil, assigns(:category)
     assert_equal mock_product, assigns(:product)
   end
-end
-
-class NewActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
 
   def test_expose_a_new_product_with_category
     Category.expects(:find).with('37').returns(mock_category)
@@ -87,12 +66,8 @@ class NewActionOptionalTest < TEST_CLASS
     assert_equal nil, assigns(:category)
     assert_equal mock_product, assigns(:product)
   end
-end
-
-class EditActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
 
-  def test_expose_the_resquested_product_with_category
+  def test_expose_the_resquested_product_for_edition_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
@@ -101,16 +76,12 @@ class EditActionOptionalTest < TEST_CLASS
     assert_equal mock_product, assigns(:product)
   end
 
-  def test_expose_the_resquested_product_without_category
+  def test_expose_the_resquested_product_for_edition_without_category
     Product.expects(:find).with('42').returns(mock_product)
     get :edit, :id => '42'
     assert_equal nil, assigns(:category)
     assert_equal mock_product, assigns(:product)
   end
-end
-
-class CreateActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
 
   def test_expose_a_newly_create_product_with_category
     Category.expects(:find).with('37').returns(mock_category)
@@ -127,16 +98,13 @@ class CreateActionOptionalTest < TEST_CLASS
     assert_equal nil, assigns(:category)
     assert_equal mock_product, assigns(:product)
   end
-end
-
-class UpdateActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
 
   def test_update_the_requested_object_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
     mock_product.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+
     put :update, :id => '42', :category_id => '37', :product => {:these => 'params'}
     assert_equal mock_category, assigns(:category)
     assert_equal mock_product, assigns(:product)
@@ -145,20 +113,19 @@ class UpdateActionOptionalTest < TEST_CLASS
   def test_update_the_requested_object_without_category
     Product.expects(:find).with('42').returns(mock_product)
     mock_product.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+
     put :update, :id => '42', :product => {:these => 'params'}
     assert_equal nil, assigns(:category)
     assert_equal mock_product, assigns(:product)
   end
-end
-
-class DestroyActionOptionalTest < TEST_CLASS
-  include ProductTestHelper
 
   def test_the_resquested_product_is_destroyed_with_category
     Category.expects(:find).with('37').returns(mock_category)
     mock_category.expects(:products).returns(Product)
     Product.expects(:find).with('42').returns(mock_product)
     mock_product.expects(:destroy)
+    @controller.expects(:collection_url).returns('/')
+
     delete :destroy, :id => '42', :category_id => '37'
     assert_equal mock_category, assigns(:category)
     assert_equal mock_product, assigns(:product)
@@ -167,14 +134,12 @@ class DestroyActionOptionalTest < TEST_CLASS
   def test_the_resquested_product_is_destroyed_without_category
     Product.expects(:find).with('42').returns(mock_product)
     mock_product.expects(:destroy)
+    @controller.expects(:collection_url).returns('/')
+
     delete :destroy, :id => '42'
     assert_equal nil, assigns(:category)
     assert_equal mock_product, assigns(:product)
   end
-end
-
-class OptionalHelpersTest < TEST_CLASS
-  include ProductTestHelper
 
   def test_polymorphic_helpers
     Product.expects(:find).with(:all).returns([mock_product])
@@ -187,4 +152,13 @@ class OptionalHelpersTest < TEST_CLASS
     assert_equal nil, assigns(:category)
     assert_equal nil, @controller.send(:parent)
   end
+
+  protected
+    def mock_category(stubs={})
+      @mock_category ||= mock(stubs)
+    end
+
+    def mock_product(stubs={})
+      @mock_product ||= mock(stubs)
+    end
 end