inherited_resources 1.2.2 → 1.3.0

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/test/aliases_test.rb

@@ -126,7 +126,16 @@ class AliasesTest < ActionController::TestCase
 
   def test_options_are_used_in_respond_with
     @request.accept = "application/xml"
-    Student.stubs(:new).returns(mock_student(:save => true, :to_xml => "XML"))
+    mock_student = mock_student(:save => true, :to_xml => "XML")
+    Student.stubs(:new).returns(mock_student)
+
+    # Bug in mocha does not accept strings on respond_to
+    mock_student.singleton_class.class_eval do
+      def respond_to?(method, *)
+        method == "to_xml" || super
+      end
+    end
+
     post :create
     assert_equal "http://test.host/", @response.location
   end

data/test/base_test.rb

@@ -104,6 +104,14 @@ class ShowActionBaseTest < ActionController::TestCase
     @request.accept = 'application/xml'
     User.expects(:find).with('42').returns(mock_user)
     mock_user.expects(:to_xml).returns("Generated XML")
+
+    # Bug in mocha does not accept strings on respond_to
+    mock_user.singleton_class.class_eval do
+      def respond_to?(method, *)
+        method == "to_xml" || super
+      end
+    end
+
     get :show, :id => '42'
     assert_response :success
     assert_equal 'Generated XML', @response.body
@@ -130,6 +138,14 @@ class NewActionBaseTest < ActionController::TestCase
     @request.accept = 'application/xml'
     User.expects(:new).returns(mock_user)
     mock_user.expects(:to_xml).returns("Generated XML")
+
+    # Bug in mocha does not accept strings on respond_to
+    mock_user.singleton_class.class_eval do
+      def respond_to?(method, *)
+        method == "to_xml" || super
+      end
+    end
+
     get :new
     assert_response :success
     assert_equal 'Generated XML', @response.body
@@ -162,6 +178,14 @@ class CreateActionBaseTest < ActionController::TestCase
     post :create, :user => {:these => 'params'}
     assert_equal mock_user, assigns(:user)
   end
+  
+  def test_expose_a_newly_create_user_when_saved_with_success_and_role_setted
+    @controller.class.send(:with_role, :admin)
+    User.expects(:new).with({'these' => 'params'}, {:as => :admin}).returns(mock_user(:save => true))
+    post :create, :user => {:these => 'params'}
+    assert_equal mock_user, assigns(:user)
+    @controller.class.send(:with_role, nil)
+  end
 
   def test_redirect_to_the_created_user
     User.stubs(:new).returns(mock_user(:save => true))
@@ -205,8 +229,17 @@ class UpdateActionBaseTest < ActionController::TestCase
     put :update, :id => '42', :user => {:these => 'params'}
     assert_equal mock_user, assigns(:user)
   end
+  
+  def test_update_the_requested_object_when_setted_role
+    @controller.class.send(:with_role, :admin)
+    User.expects(:find).with('42').returns(mock_user)
+    mock_user.expects(:update_attributes).with({'these' => 'params'}, {:as => :admin}).returns(true)
+    put :update, :id => '42', :user => {:these => 'params'}
+    assert_equal mock_user, assigns(:user)
+    @controller.class.send(:with_role, nil)
+  end
 
-  def test_redirect_to_the_created_user
+  def test_redirect_to_the_updated_user
     User.stubs(:find).returns(mock_user(:update_attributes => true))
     @controller.expects(:resource_url).returns('http://test.host/')
     put :update

data/test/customized_base_test.rb

@@ -26,7 +26,7 @@ class CarsController < InheritedResources::Base
     end
 
     def update_resource(resource, attributes)
-      resource.update_successfully(attributes)
+      resource.update_successfully(*attributes)
     end
 
     def destroy_resource(resource)

data/test/multiple_nested_optional_belongs_to_test.rb

@@ -0,0 +1,369 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class Student; end
+class Manager; end
+class Employee; end
+
+class Project
+	def self.human_name; "Project"; end
+end
+
+class ProjectsController < InheritedResources::Base
+	belongs_to :student, :manager, :employee, :optional => true
+end
+
+class MultipleNestedOptionalTest < ActionController::TestCase
+	tests ProjectsController
+
+	def setup
+		@controller.stubs(:resource_url).returns('/')
+		@controller.stubs(:collection_url).returns('/')
+	end
+
+	# INDEX
+	def test_expose_all_projects_as_instance_variable_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_with_manager
+		Manager.expects(:find).with('38').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :manager_id => '38'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_with_employee
+		Employee.expects(:find).with('666').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :employee_id => '666'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:scoped).returns([mock_project])
+		get :index, :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	def test_expose_all_projects_as_instance_variable_without_parents
+		Project.expects(:scoped).returns([mock_project])
+		get :index
+		assert_equal [mock_project], assigns(:projects)
+	end
+
+	# SHOW
+	def test_expose_the_requested_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :show, :id => '42', :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :show, :id => '42', :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :show, :id => '42', :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('13').returns(mock_project)
+		get :show, :id => '13', :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_without_parents
+		Project.expects(:find).with('13').returns(mock_project)
+		get :show, :id => '13'
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# NEW
+	def test_expose_a_new_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).returns(mock_project)
+		get :new, :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_new_project_without_parents
+		Project.expects(:new).returns(mock_project)
+		get :new
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# EDIT
+	def test_expose_the_requested_project_for_edition_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :edit, :id => '42', :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :edit, :id => '42', :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		get :edit, :id => '42', :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('13').returns(mock_project)
+		get :edit, :id => '13', :manager_id => '37', :employee_id => '42'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_the_requested_project_for_edition_without_parents
+		Project.expects(:find).with('13').returns(mock_project)
+		get :edit, :id => '13'
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# CREATE
+	def test_expose_a_newly_created_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :student_id => '37', :project => { :these => 'params' }
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_newly_created_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :manager_id => '37', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+	
+	def test_expose_a_newly_created_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :employee_id => '37', :project => { :these => 'params' }
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_newly_created_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('42').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:build).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :manager_id => '37', :employee_id => '42', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_expose_a_newly_created_project_without_parents
+		Project.expects(:new).with({ 'these' => 'params' }).returns(mock_project(:save => true))
+		post :create, :project => { :these => 'params' }
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# UPDATE
+	def test_update_the_requested_project_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :student_id => '37', :project => { :these => 'params' }
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_update_the_requested_project_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :manager_id => '37', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_update_the_requested_project_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :employee_id => '37', :project => { :these => 'params' }
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_update_the_requested_project_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('13').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:update_attributes).with({ 'these' => 'params' }).returns(true)
+		put :update, :id => '42', :manager_id => '37', :employee_id => '13', :project => { :these => 'params' }
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	# DESTROY
+	def test_the_requested_project_is_destroyed_with_student
+		Student.expects(:find).with('37').returns(mock_student)
+		mock_student.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :student_id => '37'
+		assert_equal mock_student, assigns(:student)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_with_manager
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :manager_id => '37'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_with_employee
+		Employee.expects(:find).with('37').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :employee_id => '37'
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_with_manager_and_employee
+		Manager.expects(:find).with('37').returns(mock_manager)
+		mock_manager.expects(:employees).returns(Employee)
+		Employee.expects(:find).with('13').returns(mock_employee)
+		mock_employee.expects(:projects).returns(Project)
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42', :manager_id => '37', :employee_id => '13'
+		assert_equal mock_manager, assigns(:manager)
+		assert_equal mock_employee, assigns(:employee)
+		assert_equal mock_project, assigns(:project)
+	end
+
+	def test_the_requested_project_is_destroyed_without_parents
+		Project.expects(:find).with('42').returns(mock_project)
+		mock_project.expects(:destroy).returns(true)
+
+		delete :destroy, :id => '42'
+		assert_equal mock_project, assigns(:project)
+	end
+
+	protected
+	def mock_manager(stubs={})
+		@mock_manager ||= mock(stubs)
+	end
+
+	def mock_employee(stubs={})
+		@mock_employee ||= mock(stubs)
+	end
+
+	def mock_student(stubs={})
+		@mock_student ||= mock(stubs)
+	end
+
+	def mock_project(stubs={})
+		@mock_project ||= mock(stubs)
+	end
+end