karsthammer-inherited_resources 1.1.2.1 → 1.2.1

data/test/belongs_to_test.rb

@@ -24,7 +24,7 @@ class BelongsToTest < ActionController::TestCase
   end
 
   def test_expose_all_comments_as_instance_variable_on_index
-    Comment.expects(:all).returns([mock_comment])
+    Comment.expects(:scoped).returns([mock_comment])
     get :index, :post_id => '37'
     assert_equal mock_post, assigns(:post)
     assert_equal [mock_comment], assigns(:comments)
@@ -51,6 +51,14 @@ class BelongsToTest < ActionController::TestCase
     assert_equal mock_comment, assigns(:comment)
   end
 
+  def test_redirect_to_the_post_on_update_if_show_and_index_undefined
+    @controller.class.send(:actions, :all, :except => [:show, :index])
+    @controller.expects(:parent_url).returns('http://test.host/')
+    Comment.expects(:build).with({'these' => 'params'}).returns(mock_comment(:save => true))
+    post :create, :post_id => '37', :comment => {:these => 'params'}
+    assert_redirected_to 'http://test.host/'
+  end
+
   def test_expose_a_newly_create_comment_on_create
     Comment.expects(:build).with({'these' => 'params'}).returns(mock_comment(:save => true))
     post :create, :post_id => '37', :comment => {:these => 'params'}
@@ -58,6 +66,14 @@ class BelongsToTest < ActionController::TestCase
     assert_equal mock_comment, assigns(:comment)
   end
 
+  def test_redirect_to_the_post_on_update_if_show_and_index_undefined
+    @controller.class.send(:actions, :all, :except => [:show, :index])
+    Comment.stubs(:find).returns(mock_comment(:update_attributes => true))
+    @controller.expects(:parent_url).returns('http://test.host/')
+    put :update, :id => '42', :post_id => '37', :comment => {:these => 'params'}
+    assert_redirected_to 'http://test.host/'
+  end
+
   def test_update_the_requested_object_on_update
     Comment.expects(:find).with('42').returns(mock_comment)
     mock_comment.expects(:update_attributes).with({'these' => 'params'}).returns(true)
@@ -66,6 +82,15 @@ class BelongsToTest < ActionController::TestCase
     assert_equal mock_comment, assigns(:comment)
   end
 
+  def test_redirect_to_the_post_on_destroy_if_show_and_index_undefined
+    @controller.class.send(:actions, :all, :except => [:show, :index])
+    Comment.expects(:find).with('42').returns(mock_comment)
+    mock_comment.expects(:destroy)
+    @controller.expects(:parent_url).returns('http://test.host/')
+    delete :destroy, :id => '42', :post_id => '37'
+    assert_redirected_to 'http://test.host/'
+  end
+
   def test_the_requested_comment_is_destroyed_on_destroy
     Comment.expects(:find).with('42').returns(mock_comment)
     mock_comment.expects(:destroy)
@@ -73,15 +98,15 @@ class BelongsToTest < ActionController::TestCase
     assert_equal mock_post, assigns(:post)
     assert_equal mock_comment, assigns(:comment)
   end
-  
+
   def helper_methods
     @controller.class._helpers.instance_methods.map {|m| m.to_s }
   end
-  
+
   def test_helpers
     mock_post.stubs(:class).returns(Post)
 
-    Comment.expects(:all).returns([mock_comment])
+    Comment.expects(:scoped).returns([mock_comment])
     get :index, :post_id => '37'
 
     assert helper_methods.include?('parent?')

data/test/belongs_to_with_shallow_test.rb

@@ -0,0 +1,93 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Post
+  extend ActiveModel::Naming
+end
+
+class Tag
+  extend ActiveModel::Naming
+end
+
+class TagsController < InheritedResources::Base
+  belongs_to :post, :shallow => true, :finder => :find_by_slug
+end
+
+class BelongsToWithShallowTest < ActionController::TestCase
+  tests TagsController
+
+  def setup
+    Post.expects(:find_by_slug).with('thirty_seven').returns(mock_post)
+    mock_post.expects(:tags).returns(Tag)
+
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_expose_all_tags_as_instance_variable_on_index
+    Tag.expects(:scoped).returns([mock_tag])
+    get :index, :post_id => 'thirty_seven'
+    assert_equal mock_post, assigns(:post)
+    assert_equal [mock_tag], assigns(:tags)
+  end
+
+  def test_expose_a_new_tag_on_new
+    Tag.expects(:build).returns(mock_tag)
+    get :new, :post_id => 'thirty_seven'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_tag, assigns(:tag)
+  end
+
+  def test_expose_a_newly_create_tag_on_create
+    Tag.expects(:build).with({'these' => 'params'}).returns(mock_tag(:save => true))
+    post :create, :post_id => 'thirty_seven', :tag => {:these => 'params'}
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_tag, assigns(:tag)
+  end
+
+  def test_expose_the_requested_tag_on_show
+    should_find_parents
+    get :show, :id => '42'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_tag, assigns(:tag)
+  end
+
+  def test_expose_the_requested_tag_on_edit
+    should_find_parents
+    get :edit, :id => '42'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_tag, assigns(:tag)
+  end
+
+  def test_update_the_requested_object_on_update
+    should_find_parents
+    mock_tag.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => '42', :tag => {:these => 'params'}
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_tag, assigns(:tag)
+  end
+
+  def test_the_requested_tag_is_destroyed_on_destroy
+    should_find_parents
+    mock_tag.expects(:destroy)
+    delete :destroy, :id => '42', :post_id => '37'
+    assert_equal mock_post, assigns(:post)
+    assert_equal mock_tag, assigns(:tag)
+  end
+
+  protected
+    def should_find_parents
+      mock_tag.expects(:post).returns(mock_post)
+      mock_post.expects(:to_param).returns('thirty_seven')
+      Tag.expects(:find).with('42').twice.returns(mock_tag)
+    end
+
+    def mock_post(stubs={})
+      @mock_post ||= mock(stubs)
+    end
+
+    def mock_tag(stubs={})
+      @mock_tag ||= mock(stubs)
+    end
+
+end
+

data/test/class_methods_test.rb

@@ -4,6 +4,7 @@ class Book; end
 class Folder; end
 
 class BooksController < InheritedResources::Base
+  custom_actions :collection => :search, :resource => [:delete]
   actions :index, :show
 end
 
@@ -33,9 +34,9 @@ class ActionsClassMethodTest < ActionController::TestCase
 
   def test_actions_are_undefined
     action_methods = BooksController.send(:action_methods).map(&:to_sym)
-    assert_equal 2, action_methods.size
+    assert_equal 4, action_methods.size
 
-    [:index, :show].each do |action|
+    [:index, :show, :delete, :search].each do |action|
       assert action_methods.include?(action)
     end
 
@@ -54,6 +55,7 @@ class ActionsClassMethodTest < ActionController::TestCase
       assert action_methods.include? action
     end
   end
+
 end
 
 class DefaultsClassMethodTest < ActiveSupport::TestCase
@@ -62,23 +64,23 @@ class DefaultsClassMethodTest < ActiveSupport::TestCase
   end
 
   def test_defaults_are_set
-    assert Folder, FoldersController.send(:resource_class)
-    assert :folder, FoldersController.send(:resources_configuration)[:self][:instance_name]
-    assert :folders, FoldersController.send(:resources_configuration)[:self][:collection_name]
+    assert_equal Folder, FoldersController.send(:resource_class)
+    assert_equal :folder, FoldersController.send(:resources_configuration)[:self][:instance_name]
+    assert_equal :folders, FoldersController.send(:resources_configuration)[:self][:collection_name]
   end
 
   def test_defaults_can_be_overwriten
     BooksController.send(:defaults, :resource_class => String, :instance_name => 'string', :collection_name => 'strings')
 
-    assert String, BooksController.send(:resource_class)
-    assert :string, BooksController.send(:resources_configuration)[:self][:instance_name]
-    assert :strings, BooksController.send(:resources_configuration)[:self][:collection_name]
+    assert_equal String, BooksController.send(:resource_class)
+    assert_equal :string, BooksController.send(:resources_configuration)[:self][:instance_name]
+    assert_equal :strings, BooksController.send(:resources_configuration)[:self][:collection_name]
 
     BooksController.send(:defaults, :class_name => 'Fixnum', :instance_name => :fixnum, :collection_name => :fixnums)
 
-    assert String, BooksController.send(:resource_class)
-    assert :string, BooksController.send(:resources_configuration)[:self][:instance_name]
-    assert :strings, BooksController.send(:resources_configuration)[:self][:collection_name]
+    assert_equal Fixnum, BooksController.send(:resource_class)
+    assert_equal :fixnum, BooksController.send(:resources_configuration)[:self][:instance_name]
+    assert_equal :fixnums, BooksController.send(:resources_configuration)[:self][:collection_name]
   end
 
   def test_defaults_raises_invalid_key

data/test/customized_belongs_to_test.rb

@@ -22,7 +22,7 @@ class CustomizedBelongsToTest < ActionController::TestCase
   end
 
   def test_expose_the_requested_school_with_chosen_instance_variable_on_index
-    Professor.stubs(:all).returns([mock_professor])
+    Professor.stubs(:scoped).returns([mock_professor])
     get :index, :school_title => 'nice'
     assert_equal mock_school, assigns(:great_school)
   end

data/test/customized_redirect_to_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Post;
+  def self.human_name; 'Post'; end
+end
+
+class PostsController < InheritedResources::Base
+    actions :all, :except => [:show]
+end
+
+class RedirectToIndexWithoutShowTest < ActionController::TestCase
+  tests PostsController
+
+  def test_redirect_index_url_after_create
+    Post.stubs(:new).returns(mock_machine(:save => true))
+    assert !PostsController.respond_to?(:show)
+    post :create
+    assert_redirected_to 'http://test.host/posts'
+  end
+
+   def test_redirect_to_index_url_after_update
+     Post.stubs(:find).returns(mock_machine(:update_attributes => true))
+     assert !PostsController.respond_to?(:show)
+     put :update
+     assert_redirected_to 'http://test.host/posts'
+   end
+
+  protected
+    def mock_machine(stubs={})
+      @mock_machine ||= mock(stubs)
+    end
+end

data/test/defaults_test.rb

@@ -2,11 +2,16 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class Malarz
   def self.human_name; 'Painter'; end
+
+  def to_param
+    self.slug
+  end
 end
 
 class PaintersController < InheritedResources::Base
   defaults :instance_name => 'malarz', :collection_name => 'malarze',
-           :resource_class => Malarz, :route_prefix => nil
+           :resource_class => Malarz, :route_prefix => nil,
+           :finder => :find_by_slug
 end
 
 class DefaultsTest < ActionController::TestCase
@@ -18,14 +23,14 @@ class DefaultsTest < ActionController::TestCase
   end
 
   def test_expose_all_painters_as_instance_variable
-    Malarz.expects(:all).returns([mock_painter])
+    Malarz.expects(:scoped).returns([mock_painter])
     get :index
     assert_equal [mock_painter], assigns(:malarze)
   end
 
   def test_expose_the_requested_painter_on_show
-    Malarz.expects(:find).with('42').returns(mock_painter)
-    get :show, :id => '42'
+    Malarz.expects(:find_by_slug).with('forty_two').returns(mock_painter)
+    get :show, :id => 'forty_two'
     assert_equal mock_painter, assigns(:malarz)
   end
 
@@ -36,8 +41,8 @@ class DefaultsTest < ActionController::TestCase
   end
 
   def test_expose_the_requested_painter_on_edit
-    Malarz.expects(:find).with('42').returns(mock_painter)
-    get :edit, :id => '42'
+    Malarz.expects(:find_by_slug).with('forty_two').returns(mock_painter)
+    get :edit, :id => 'forty_two'
     assert_response :success
     assert_equal mock_painter, assigns(:malarz)
   end
@@ -49,16 +54,16 @@ class DefaultsTest < ActionController::TestCase
   end
 
   def test_update_the_requested_object
-    Malarz.expects(:find).with('42').returns(mock_painter)
+    Malarz.expects(:find_by_slug).with('forty_two').returns(mock_painter)
     mock_painter.expects(:update_attributes).with({'these' => 'params'}).returns(true)
-    put :update, :id => '42', :malarz => {:these => 'params'}
+    put :update, :id => 'forty_two', :malarz => {:these => 'params'}
     assert_equal mock_painter, assigns(:malarz)
   end
 
   def test_the_requested_painter_is_destroyed
-    Malarz.expects(:find).with('42').returns(mock_painter)
+    Malarz.expects(:find_by_slug).with('forty_two').returns(mock_painter)
     mock_painter.expects(:destroy)
-    delete :destroy, :id => '42'
+    delete :destroy, :id => 'forty_two'
     assert_equal mock_painter, assigns(:malarz)
   end
 
@@ -68,3 +73,125 @@ class DefaultsTest < ActionController::TestCase
     end
 end
 
+class Professor
+  def self.human_name; 'Einstein'; end
+end
+module University; end
+class University::ProfessorsController < InheritedResources::Base
+  defaults :finder => :find_by_slug
+end
+
+class DefaultsNamespaceTest < ActionController::TestCase
+  tests University::ProfessorsController
+
+  def setup
+    @controller.stubs(:resource_url).returns('/')
+    @controller.stubs(:collection_url).returns('/')
+  end
+
+  def test_expose_all_professors_as_instance_variable
+    Professor.expects(:scoped).returns([mock_professor])
+    get :index
+    assert_equal [mock_professor], assigns(:professors)
+  end
+
+  def test_expose_the_requested_painter_on_show
+    Professor.expects(:find_by_slug).with('forty_two').returns(mock_professor)
+    get :show, :id => 'forty_two'
+    assert_equal mock_professor, assigns(:professor)
+  end
+
+  def test_expose_a_new_painter
+    Professor.expects(:new).returns(mock_professor)
+    get :new
+    assert_equal mock_professor, assigns(:professor)
+  end
+
+  def test_expose_the_requested_painter_on_edit
+    Professor.expects(:find_by_slug).with('forty_two').returns(mock_professor)
+    get :edit, :id => 'forty_two'
+    assert_response :success
+    assert_equal mock_professor, assigns(:professor)
+  end
+
+  def test_expose_a_newly_create_professor_when_saved_with_success
+    Professor.expects(:new).with({'these' => 'params'}).returns(mock_professor(:save => true))
+    post :create, :professor => {:these => 'params'}
+    assert_equal mock_professor, assigns(:professor)
+  end
+
+  def test_update_the_professor
+    Professor.expects(:find_by_slug).with('forty_two').returns(mock_professor)
+    mock_professor.expects(:update_attributes).with({'these' => 'params'}).returns(true)
+    put :update, :id => 'forty_two', :professor => {:these => 'params'}
+    assert_equal mock_professor, assigns(:professor)
+  end
+
+  def test_the_requested_painter_is_destroyed
+    Professor.expects(:find_by_slug).with('forty_two').returns(mock_professor)
+    mock_professor.expects(:destroy)
+    delete :destroy, :id => 'forty_two'
+    assert_equal mock_professor, assigns(:professor)
+  end
+
+  protected
+    def mock_professor(stubs={})
+      @mock_professor ||= mock(stubs)
+    end
+end
+
+class Group
+end
+class AdminGroup
+end
+module Admin; end
+class Admin::Group
+end
+class Admin::GroupsController < InheritedResources::Base
+end
+class NamespacedModelForNamespacedController < ActionController::TestCase
+  tests Admin::GroupsController
+
+  def test_that_it_picked_the_namespaced_model
+    # make public so we can test it
+    Admin::GroupsController.send(:public, *Admin::GroupsController.protected_instance_methods)
+    assert_equal Admin::Group, @controller.resource_class
+  end
+end
+
+class Role
+end
+class AdminRole
+end
+class Admin::RolesController < InheritedResources::Base
+end
+class TwoPartNameModelForNamespacedController < ActionController::TestCase
+  tests Admin::RolesController
+
+  def test_that_it_picked_the_camelcased_model
+    # make public so we can test it
+    Admin::RolesController.send(:public, *Admin::RolesController.protected_instance_methods)
+    assert_equal AdminRole, @controller.resource_class
+  end
+end
+
+class User
+end
+class Admin::UsersController < InheritedResources::Base
+end
+class TwoPartNameModelForNamespacedController < ActionController::TestCase
+  tests Admin::UsersController
+
+  def setup
+    # make public so we can test it
+    Admin::UsersController.send(:public, *Admin::UsersController.protected_instance_methods)
+  end
+
+  def test_that_it_picked_the_camelcased_model
+    assert_equal User, @controller.resource_class
+  end
+
+  def test_that_it_got_the_rquest_params_right
+    assert_equal 'user', @controller.resources_configuration[:self][:request_name]
+  end
+end