dry_crud 1.2.7 → 1.3.0

data/lib/generators/dry_crud/templates/test/custom_assertions.rb

@@ -4,43 +4,43 @@
 # Ideally, include this module into your test_helper.rb file:
 #  # at the beginning of the file:
 #  require 'custom_assertions'
-#  
+#
 #  # inside the class definition:
 #  include CustomAssertions
 module CustomAssertions
-  
+
   # Asserts that the element is included in the collection.
   def assert_include(collection, element, message = "")
-    full_message = build_message(message, "<?> expected to be included in \n<?>.", 
+    full_message = build_message(message, "<?> expected to be included in \n<?>.",
                                  element, collection)
     assert_block(full_message) { collection.include?(element) }
   end
-    
+
   # Asserts that the element is not included in the collection.
   def assert_not_include(collection, element, message = "")
-    full_message = build_message(message, "<?> expected not to be included in \n<?>.", 
+    full_message = build_message(message, "<?> expected not to be included in \n<?>.",
                                  element, collection)
     assert_block(full_message) { !collection.include?(element) }
   end
-  
+
   # Asserts that regexp occurs exactly expected times in string.
   def assert_count(expected, regexp, string, message = "")
     actual = string.scan(regexp).size
-    full_message = build_message(message, "<?> expected to occur ? time(s), but occured ? time(s) in \n<?>.", 
+    full_message = build_message(message, "<?> expected to occur ? time(s), but occured ? time(s) in \n<?>.",
                                  regexp, expected, actual, string)
     assert_block(full_message) { expected == actual }
   end
-  
+
   # Asserts that the given active model record is valid.
   # This method used to be part of Rails but was deprecated, no idea why.
   def assert_valid(record, message = "")
     record.valid?
-    full_message = build_message(message, 
-        "? expected to be valid, but has the following errors: \n ?.", 
+    full_message = build_message(message,
+        "? expected to be valid, but has the following errors: \n ?.",
        record, record.errors.full_messages.join("\n"))
     assert_block(full_message) { record.valid? }
   end
-  
+
   # Asserts that the given active model record is not valid.
   # If you provide a set of invalid attribute symbols, all of and only these
   # attributes are expected to have errors. If no invalid attributes are
@@ -48,13 +48,13 @@ module CustomAssertions
   def assert_not_valid(record, *invalid_attrs)
     message = build_message("", "? expected to be invalid, but is valid.", record)
     assert_block(message) { !record.valid? }
-    
+
     # assert that the given attributes have errors.
     invalid_attrs.each do |a|
       message = build_message("", "Attribute <?> expected to be invalid, but is valid.", a)
       assert_block(message) { record.errors[a].present? }
     end
-    
+
     if invalid_attrs.present?
       # assert that no other than the invalid attributes have errors.
       record.errors.each do |a, error|
@@ -64,4 +64,15 @@ module CustomAssertions
     end
   end
   
+  # The method used to by Test::Unit to format arguments in
+  # #build_message. Prints ActiveRecord objects in a simpler format.
+  # Only works for Ruby 1.9
+  def mu_pp(obj)
+    if obj.is_a?(ActiveRecord::Base)
+      obj.to_s
+    else
+      super
+    end
+  end
+
 end

data/lib/generators/dry_crud/templates/test/functional/crud_controller_test_helper.rb

@@ -2,84 +2,84 @@
 # Simply implement the two methods :test_entry and :test_entry_attrs to test the basic
 # crud functionality. Override the test methods if you changed the behaviour in your subclass
 # controller.
-module CrudControllerTestHelper 
-    
+module CrudControllerTestHelper
+
   def test_index
     get :index
     assert_response :success
     assert_template 'index'
     assert_present assigns(:entries)
   end
-  
+
   def test_index_xml
     get :index, :format => 'xml'
     assert_response :success
     assert_present assigns(:entries)
     assert @response.body.starts_with?("<?xml")
   end
-  
+
   def test_index_search
     field = @controller.search_columns.first
     val = field && test_entry[field].to_s
     return if val.blank?   # does not support search or no value in this field
- 
+
     get :index, :q => val[0..((val.size + 1)/ 2)]
     assert_response :success
     assert_present assigns(:entries)
     assert assigns(:entries).include?(test_entry)
   end
-  
+
   def test_index_sort_asc
     col = model_class.column_names.first
     get :index, :sort => col, :sort_dir => 'asc'
     assert_response :success
     assert_present assigns(:entries)
     sorted = assigns(:entries).sort_by &(col.to_sym)
-    assert sorted, assigns(:entries)
+    assert_equal sorted, assigns(:entries)
   end
-    
+
   def test_index_sort_desc
     col = model_class.column_names.first
     get :index, :sort => col, :sort_dir => 'desc'
     assert_response :success
     assert_present assigns(:entries)
     sorted = assigns(:entries).sort_by &(col.to_sym)
-    assert sorted.reverse, assigns(:entries)
+    assert_equal sorted.reverse, assigns(:entries)
   end
-  
+
   def test_show
     get :show, :id => test_entry.id
     assert_response :success
     assert_template 'show'
     assert_equal test_entry, assigns(:entry)
   end
-  
+
   def test_show_xml
     get :show, :id => test_entry.id, :format => 'xml'
     assert_response :success
     assert_equal test_entry, assigns(:entry)
     assert @response.body.starts_with?("<?xml")
   end
-  
+
   def test_show_with_not_existing_id_raises_RecordNotFound
     assert_raise(ActiveRecord::RecordNotFound) do
       get :show, :id => 9999
     end
   end
-  
+
   def test_show_without_id_redirects_to_index
     assert_raise(ActionController::RoutingError) do
       get :show
     end
   end
-  
+
   def test_new
     get :new
     assert_response :success
     assert_template 'new'
     assert assigns(:entry).new_record?
   end
-  
+
   def test_create
     assert_difference("#{model_class.name}.count") do
       post :create, model_identifier => test_entry_attrs
@@ -88,7 +88,7 @@ module CrudControllerTestHelper
     assert ! assigns(:entry).new_record?
     assert_test_attrs_equal
   end
-  
+
   def test_create_xml
     assert_difference("#{model_class.name}.count") do
       post :create, model_identifier => test_entry_attrs, :format => 'xml'
@@ -96,20 +96,20 @@ module CrudControllerTestHelper
     assert_response :success
     assert @response.body.starts_with?("<?xml")
   end
-  
+
   def test_edit
     get :edit, :id => test_entry.id
     assert_response :success
     assert_template 'edit'
     assert_equal test_entry, assigns(:entry)
   end
-  
+
   def test_edit_without_id_raises_RecordNotFound
     assert_raise(ActionController::RoutingError) do
       get :edit
     end
   end
-  
+
   def test_update
     assert_no_difference("#{model_class.name}.count") do
       put :update, :id => test_entry.id, model_identifier => test_entry_attrs
@@ -140,66 +140,36 @@ module CrudControllerTestHelper
     assert_response :success
     assert_equal "", @response.body.strip
   end
-  
-  # no need to test http methods for pure restfull controllers
-  def ignore_test_create_with_wrong_http_method_redirects
-    get :create, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-    
-    put :create, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-    
-    delete :create, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-  end
 
-  # no need to test http methods for pure restfull controllers
-  def ignore_test_update_with_wrong_http_method_redirects
-    get :update, :id => test_entry.id, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-    
-    delete :update, :id => test_entry.id, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-  end
-  
-  # no need to test http methods for pure restfull controllers
-  def ignore_test_destroy_with_wrong_http_method_redirects
-    get :destroy, :id => test_entry.id
-    assert_redirected_to_index
-    
-    put :destroy, :id => test_entry.id
-    assert_redirected_to_index
-  end
+  protected
 
-  protected 
-  
   def assert_redirected_to_index
     assert_redirected_to :action => 'index', :returning => true
   end
-  
+
   def assert_test_attrs_equal
     test_entry_attrs.each do |key, value|
       actual = assigns(:entry).send(key)
       assert_equal value, actual, "#{key} is expected to be <#{value.inspect}>, got <#{actual.inspect}>"
     end
   end
-  
+
   def model_class
     @controller.model_class
   end
-  
+
   def model_identifier
     @controller.model_identifier
   end
-  
+
   # Test object used in several tests
   def test_entry
     raise "Implement this method in your test class"
   end
-  
+
   # Attribute hash used in several tests
   def test_entry_attrs
     raise "Implement this method in your test class"
   end
-  
+
 end

data/lib/generators/dry_crud/templates/test/functional/crud_test_models_controller_test.rb

@@ -1,22 +1,22 @@
 require 'test_helper'
 require 'crud_test_model'
-require File.join(File.dirname(__FILE__), 'crud_controller_test_helper')
+require File.join('functional', 'crud_controller_test_helper')
 
-# Tests all actions of the CrudController based on a dummy model 
+# Tests all actions of the CrudController based on a dummy model
 # (CrudTestModel). This is useful to test the general behavior
 # of CrudController.
 class CrudTestModelsControllerTest < ActionController::TestCase
-  
+
   include CrudControllerTestHelper
   include CrudTestHelper
-  
+
   attr_accessor :models
-  
+
   setup :reset_db, :setup_db, :create_test_data, :special_routing
-  
+
   teardown :reset_db
 
-  
+
   def test_setup
     assert_equal 6, CrudTestModel.count
     assert_equal CrudTestModelsController, @controller.class
@@ -25,20 +25,20 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     # no need to hide actions for pure restful controllers
     #assert_equal %w(index show new create edit update destroy).to_set, CrudTestModelsController.send(:action_methods)
   end
-  
+
   def test_index
     super
     assert_equal 6, assigns(:entries).size
     assert_equal assigns(:entries).sort_by(&:name), assigns(:entries)
     assert_equal Hash.new, session[:list_params]
   end
-  
+
   def test_index_search
-  	super
-  	assert_equal 1, assigns(:entries).size
+    super
+    assert_equal 1, assigns(:entries).size
     assert_equal({:q => 'AAAA'}, session[:list_params]['/crud_test_models'])
   end
-  
+
   def test_index_with_custom_options
     get :index, :filter => true
     assert_response :success
@@ -47,7 +47,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal 2, assigns(:entries).size
     assert_equal assigns(:entries).sort_by(&:children).reverse, assigns(:entries)
   end
-    
+
   def test_index_search_with_custom_options
     get :index, :q => 'DDD', :filter => true
     assert_response :success
@@ -57,9 +57,9 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal [CrudTestModel.find_by_name('BBBBB')], assigns(:entries)
     assert_equal({:q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
-  
+
   def test_sort_given_column
-  	get :index, :sort => 'children', :sort_dir => 'asc'
+    get :index, :sort => 'children', :sort_dir => 'asc'
     assert_response :success
     assert_template 'index'
     assert_present assigns(:entries)
@@ -67,7 +67,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal CrudTestModel.all.sort_by(&:children), assigns(:entries)
     assert_equal({:sort => 'children', :sort_dir => 'asc'}, session[:list_params]['/crud_test_models'])
   end
-  
+
   def test_sort_virtual_column
     get :index, :sort => 'chatty', :sort_dir => 'desc'
     assert_response :success
@@ -75,10 +75,10 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_present assigns(:entries)
     assert_equal 6, assigns(:entries).size
     assert_equal({:sort => 'chatty', :sort_dir => 'desc'}, session[:list_params]['/crud_test_models'])
-    
+
     sorted = CrudTestModel.all.sort_by(&:chatty)
-    
-    # sort order is ambiguous, use index    
+
+    # sort order is ambiguous, use index
     names = assigns(:entries).collect(&:name)
     assert names.index('BBBBB') < names.index('AAAAA')
     assert names.index('BBBBB') < names.index('DDDDD')
@@ -89,7 +89,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert names.index('DDDDD') < names.index('CCCCC')
     assert names.index('DDDDD') < names.index('FFFFF')
   end
-  
+
   def test_sort_with_search
     get :index, :q => 'DDD', :sort => 'chatty', :sort_dir => 'asc'
     assert_response :success
@@ -99,7 +99,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal ['CCCCC', 'DDDDD', 'BBBBB'], assigns(:entries).collect(&:name)
     assert_equal({:sort => 'chatty', :sort_dir => 'asc', :q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
-  
+
   def test_index_returning
     session[:list_params] = {}
     session[:list_params]['/crud_test_models'] = {:q => 'DDD', :sort => 'chatty', :sort_dir => 'desc'}
@@ -113,33 +113,34 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal 'chatty', @controller.params[:sort]
     assert_equal 'desc', @controller.params[:sort_dir]
   end
-  
+
   def test_new
     super
     assert assigns(:companions)
     assert_equal [:before_render_new, :before_render_form], @controller.called_callbacks
   end
-  
+
   def test_create
     super
     assert_equal [:before_create, :before_save, :after_save, :after_create], @controller.called_callbacks
   end
-  
+
   def test_edit
-  	super
+    super
     assert_equal [:before_render_edit, :before_render_form], @controller.called_callbacks
   end
-  
+
   def test_update
     super
     assert_equal [:before_update, :before_save, :after_save, :after_update], @controller.called_callbacks
   end
-  
+
   def test_destroy
     super
     assert_equal [:before_destroy, :after_destroy], @controller.called_callbacks
+    assert_equal 'model is gone', flash[:notice]
   end
-  
+
   def test_create_with_before_callback
     assert_no_difference("#{model_class.name}.count") do
       post :create, :crud_test_model => {:name => 'illegal', :children => 2}
@@ -151,7 +152,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal 'illegal', assigns(:entry).name
     assert_equal [:before_render_new, :before_render_form], @controller.called_callbacks
   end
-    
+
   def test_create_with_before_callback_redirect
     @controller.should_redirect = true
     assert_no_difference("#{model_class.name}.count") do
@@ -160,7 +161,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_redirected_to :action => 'index'
     assert_nil @controller.called_callbacks
   end
-  
+
   def test_new_with_before_render_callback_redirect_does_not_set_companions
     @controller.should_redirect = true
     get :new
@@ -168,33 +169,38 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_nil assigns(:companions)
   end
   
-  protected 
-  
+  def test_models_label
+    assert_equal 'Crud test models', @controller.models_label
+    assert_equal 'Crud test model', @controller.models_label(false)
+  end
+
+  protected
+
   def special_routing
     @routes = ActionDispatch::Routing::RouteSet.new
     _routes = @routes
-    
+
     @controller.singleton_class.send(:include, _routes.url_helpers)
     @controller.view_context_class = Class.new(@controller.view_context_class) do
       include _routes.url_helpers
     end
-    
+
     @routes.draw { resources :crud_test_models }
   end
-  
+
   def test_entry
     crud_test_models(:AAAAA)
   end
-  
+
   def test_entry_attrs
-    {:name => 'foo', 
-     :children => 42, 
+    {:name => 'foo',
+     :children => 42,
      :companion_id => 3,
-     :rating => 8.5, 
-     :income => 2.42, 
+     :rating => 8.5,
+     :income => 2.42,
      :birthdate => '31-12-1999'.to_date,
      :human => true,
      :remarks => "some custom\n\tremarks"}
   end
-  
+
 end