dry_crud 1.5.0 → 1.6.0

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

@@ -8,13 +8,13 @@ module CrudControllerTestHelper
     get :index, test_params
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
+    assert_present entries
   end
 
   def test_index_json
     get :index, test_params(:format => 'json')
     assert_response :success
-    assert_present assigns(:entries)
+    assert_present entries
     assert @response.body.starts_with?("[{"), @response.body
   end
 
@@ -25,39 +25,39 @@ module CrudControllerTestHelper
 
     get :index, test_params(:q => val[0..((val.size + 1)/ 2)])
     assert_response :success
-    assert_present assigns(:entries)
-    assert assigns(:entries).include?(test_entry)
+    assert_present entries
+    assert entries.include?(test_entry)
   end
 
   def test_index_sort_asc
     col = model_class.column_names.first
     get :index, test_params(:sort => col, :sort_dir => 'asc')
     assert_response :success
-    assert_present assigns(:entries)
-    sorted = assigns(:entries).sort_by &(col.to_sym)
-    assert_equal sorted, assigns(:entries)
+    assert_present entries
+    sorted = entries.sort_by &(col.to_sym)
+    assert_equal sorted, entries
   end
 
   def test_index_sort_desc
     col = model_class.column_names.first
     get :index, test_params(:sort => col, :sort_dir => 'desc')
     assert_response :success
-    assert_present assigns(:entries)
-    sorted = assigns(:entries).sort_by &(col.to_sym)
-    assert_equal sorted.reverse, assigns(:entries)
+    assert_present entries
+    sorted = entries.sort_by &(col.to_sym)
+    assert_equal sorted.reverse, entries
   end
 
   def test_show
     get :show, test_params(:id => test_entry.id)
     assert_response :success
     assert_template 'show'
-    assert_equal test_entry, assigns(:entry)
+    assert_equal test_entry, entry
   end
 
   def test_show_json
     get :show, test_params(:id => test_entry.id, :format => 'json')
     assert_response :success
-    assert_equal test_entry, assigns(:entry)
+    assert_equal test_entry, entry
     assert @response.body.starts_with?("{")
   end
 
@@ -71,15 +71,15 @@ module CrudControllerTestHelper
     get :new, test_params
     assert_response :success
     assert_template 'new'
-    assert assigns(:entry).new_record?
+    assert entry.new_record?
   end
 
   def test_create
     assert_difference("#{model_class.name}.count") do
       post :create, test_params(model_identifier => test_entry_attrs)
     end
-    assert_redirected_to_show assigns(:entry)
-    assert ! assigns(:entry).new_record?
+    assert_redirected_to_show entry
+    assert ! entry.new_record?
     assert_test_attrs_equal
   end
 
@@ -95,7 +95,7 @@ module CrudControllerTestHelper
     get :edit, test_params(:id => test_entry.id)
     assert_response :success
     assert_template 'edit'
-    assert_equal test_entry, assigns(:entry)
+    assert_equal test_entry, entry
   end
 
   def test_update
@@ -103,7 +103,7 @@ module CrudControllerTestHelper
       put :update, test_params(:id => test_entry.id, model_identifier => test_entry_attrs)
     end
     assert_test_attrs_equal
-    assert_redirected_to_show assigns(:entry)
+    assert_redirected_to_show entry
   end
 
   def test_update_json
@@ -134,47 +134,63 @@ module CrudControllerTestHelper
   def assert_redirected_to_index
     assert_redirected_to test_params(:action => 'index', :returning => true)
   end
-  
+
   def assert_redirected_to_show(entry)
     assert_redirected_to test_params(:action => 'show', :id => entry.id)
   end
 
   def assert_test_attrs_equal
     test_entry_attrs.each do |key, value|
-      actual = assigns(:entry).send(key)
+      actual = entry.send(key)
       assert_equal value, actual, "#{key} is expected to be <#{value.inspect}>, got <#{actual.inspect}>"
     end
   end
 
+  # The model class under test.
   def model_class
     @controller.model_class
   end
-
+  
+  # The param key for model attributes.
   def model_identifier
     @controller.model_identifier
   end
 
-  # Test object used in several tests
+  # The entry as set by the controller.
+  def entry
+    @controller.send(:entry)
+  end
+
+  # The entries as set by the controller.
+  def entries
+    @controller.send(:entries)
+  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
+  # Attribute hash used in several tests.
   def test_entry_attrs
     raise "Implement this method in your test class"
   end
-  
+
+  # The params to pass to an action, including required nesting params.
   def test_params(params = {})
     nesting_params.merge(params)
   end
-  
+
   def nesting_params
     params = {}
     # for nested controllers, add parent ids to each request
-    Array(@controller.nesting).collect do |p|
+    Array(@controller.nesting).reverse.inject(test_entry) do |parent, p|
       if p.is_a?(Class) && p < ActiveRecord::Base
         assoc = p.name.underscore
-        params["#{assoc}_id"] = test_entry.send(:"#{assoc}_id")
+        params["#{assoc}_id"] = parent.send(:"#{assoc}_id")
+        parent.send(assoc)
+      else
+        parent
       end
     end
     params

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

@@ -28,14 +28,23 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_index
     super
-    assert_equal 6, assigns(:entries).size
-    assert_equal assigns(:entries).sort_by(&:name), assigns(:entries)
+    assert_equal 6, entries.size
+    assert_equal entries.sort_by(&:name), entries
     assert_equal Hash.new, session[:list_params]
+    assert_equal entries, assigns(:crud_test_models)
+    assert_respond_to assigns(:crud_test_models), :klass
+  end
+
+  def test_index_js
+    get :index, test_params(:format => 'js')
+    assert_response :success
+    assert_equal 'index js', @response.body
+    assert_present entries
   end
 
   def test_index_search
     super
-    assert_equal 1, assigns(:entries).size
+    assert_equal 1, entries.size
     assert_equal({:q => 'AAAA'}, session[:list_params]['/crud_test_models'])
   end
 
@@ -43,18 +52,18 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     get :index, :filter => true
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
-    assert_equal 2, assigns(:entries).size
-    assert_equal assigns(:entries).sort_by(&:children).reverse, assigns(:entries)
+    assert_present entries
+    assert_equal 2, entries.size
+    assert_equal entries.sort_by(&:children).reverse, entries
   end
 
   def test_index_search_with_custom_options
     get :index, :q => 'DDD', :filter => true
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
-    assert_equal 1, assigns(:entries).size
-    assert_equal [CrudTestModel.find_by_name('BBBBB')], assigns(:entries)
+    assert_present entries
+    assert_equal 1, entries.size
+    assert_equal [CrudTestModel.find_by_name('BBBBB')], entries
     assert_equal({:q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
 
@@ -62,9 +71,9 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     get :index, :sort => 'children', :sort_dir => 'asc'
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
-    assert_equal 6, assigns(:entries).size
-    assert_equal CrudTestModel.all.sort_by(&:children), assigns(:entries)
+    assert_present entries
+    assert_equal 6, entries.size
+    assert_equal CrudTestModel.all.sort_by(&:children), entries
     assert_equal({:sort => 'children', :sort_dir => 'asc'}, session[:list_params]['/crud_test_models'])
   end
 
@@ -72,14 +81,14 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     get :index, :sort => 'chatty', :sort_dir => 'desc'
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
-    assert_equal 6, assigns(:entries).size
+    assert_present entries
+    assert_equal 6, 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
-    names = assigns(:entries).collect(&:name)
+    names = entries.collect(&:name)
     assert names.index('BBBBB') < names.index('AAAAA')
     assert names.index('BBBBB') < names.index('DDDDD')
     assert names.index('EEEEE') < names.index('AAAAA')
@@ -92,9 +101,9 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     get :index, :q => 'DDD', :sort => 'chatty', :sort_dir => 'asc'
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
-    assert_equal 3, assigns(:entries).size
-    assert_equal ['CCCCC', 'DDDDD', 'BBBBB'], assigns(:entries).collect(&:name)
+    assert_present entries
+    assert_equal 3, entries.size
+    assert_equal ['CCCCC', 'DDDDD', 'BBBBB'], entries.collect(&:name)
     assert_equal({:sort => 'chatty', :sort_dir => 'asc', :q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
 
@@ -104,9 +113,9 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     get :index, :returning => true
     assert_response :success
     assert_template 'index'
-    assert_present assigns(:entries)
-    assert_equal 3, assigns(:entries).size
-    assert_equal ['BBBBB', 'DDDDD', 'CCCCC'], assigns(:entries).collect(&:name)
+    assert_present entries
+    assert_equal 3, entries.size
+    assert_equal ['BBBBB', 'DDDDD', 'CCCCC'], entries.collect(&:name)
     assert_equal 'DDD', @controller.params[:q]
     assert_equal 'chatty', @controller.params[:sort]
     assert_equal 'desc', @controller.params[:sort_dir]
@@ -115,45 +124,66 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   def test_new
     super
     assert assigns(:companions)
+    assert_equal @controller.send(:entry), assigns(:crud_test_model)
     assert_equal [:before_render_new, :before_render_form], @controller.called_callbacks
   end
 
+  def test_show
+    super
+    assert_equal @controller.send(:entry), assigns(:crud_test_model)
+  end
+
+  def test_show_with_custom
+    get :show, test_params(:id => crud_test_models(:BBBBB).id)
+    assert_response :success
+    assert_equal 'custom html', @response.body
+  end
+
   def test_create
     super
+    assert_match /model got created/, flash[:notice]
+    assert_blank flash[:alert]
     assert_equal [:before_create, :before_save, :after_save, :after_create], @controller.called_callbacks
   end
 
   def test_edit
     super
+    assert_equal @controller.send(:entry), assigns(:crud_test_model)
     assert_equal [:before_render_edit, :before_render_form], @controller.called_callbacks
   end
 
   def test_update
     super
+    assert_match /successfully updated/, flash[:notice]
+    assert flash[:notice].html_safe?
+    assert_blank flash[:alert]
+    assert_equal @controller.send(:entry), assigns(:crud_test_model)
     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]
+    assert_match 'successfully deleted', flash[:notice]
+    assert flash[:notice].html_safe?
   end
 
   def test_create_with_before_callback
-    assert_no_difference("#{model_class.name}.count") do
+    assert_no_difference("CrudTestModel.count") do
       post :create, :crud_test_model => {:name => 'illegal', :children => 2}
     end
+    assert_response :success
     assert_template 'new'
-    assert assigns(:entry).new_record?
+    assert entry.new_record?
     assert assigns(:companions)
-    assert flash[:error].present?
-    assert_equal 'illegal', assigns(:entry).name
+    assert_present flash[:alert]
+    assert_equal 'illegal', 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
+    assert_no_difference("CrudTestModel.count") do
       post :create, :crud_test_model => {:name => 'illegal', :children => 2}
     end
     assert_redirected_to :action => 'index'
@@ -166,7 +196,83 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_redirected_to :action => 'index'
     assert_nil assigns(:companions)
   end
-  
+
+  def test_create_with_failure
+    assert_no_difference("CrudTestModel.count") do
+      post :create, :crud_test_model => {:children => 2}
+    end
+    assert_response :success
+    assert_template 'new'
+    assert entry.new_record?
+    assert assigns(:companions)
+    assert_blank flash[:notice]
+    assert_blank flash[:alert]
+    assert_blank entry.name
+    assert_equal [:before_create, :before_save, :before_render_new, :before_render_form], @controller.called_callbacks
+  end
+
+  def test_create_with_failure_json
+    assert_no_difference("CrudTestModel.count") do
+      post :create, :crud_test_model => {:children => 2}, :format => 'json'
+    end
+    assert_response :unprocessable_entity
+    assert entry.new_record?
+    assert_match /errors/, @response.body
+    assert_equal [:before_create, :before_save], @controller.called_callbacks
+  end
+
+  def test_update_with_failure
+    put :update, :id => test_entry.id, :crud_test_model => {:rating => 20}
+    assert_response :success
+    assert_template 'edit'
+    assert entry.changed?
+    assert_blank flash[:notice]
+    assert_blank flash[:alert]
+    assert_equal 20, entry.rating
+    assert_equal [:before_update, :before_save, :before_render_edit, :before_render_form], @controller.called_callbacks
+  end
+
+  def test_update_with_failure_json
+    put :update, :id => test_entry.id, :crud_test_model => {:rating => 20}, :format => 'json'
+    assert_response :unprocessable_entity
+    assert entry.changed?
+    assert_match /errors/, @response.body
+    assert_blank flash[:notice]
+    assert_equal 20, entry.rating
+    assert_equal [:before_update, :before_save], @controller.called_callbacks
+  end
+
+  def test_destroy_failure
+    assert_no_difference("#{model_class.name}.count") do
+      @request.env['HTTP_REFERER'] = crud_test_model_url(crud_test_models(:BBBBB))
+      delete :destroy, test_params(:id => crud_test_models(:BBBBB).id)
+    end
+    assert_redirected_to_show(entry)
+    assert_match /companion/, flash[:alert]
+    assert_blank flash[:notice]
+  end
+
+  def test_destroy_failure_callback
+    e = crud_test_models(:AAAAA)
+    e.update_attribute :name, 'illegal'
+    assert_no_difference("#{model_class.name}.count") do
+      delete :destroy, test_params(:id => e.id)
+    end
+    assert_redirected_to_index
+    assert_match /illegal name/, flash[:alert]
+    assert_blank flash[:notice]
+  end
+
+  def test_destroy_failure_json
+    assert_no_difference("#{model_class.name}.count") do
+      delete :destroy, test_params(:id => crud_test_models(:BBBBB).id, :format => 'json')
+    end
+    assert_response :unprocessable_entity
+    assert_match /errors/, @response.body
+    assert_blank flash[:notice]
+  end
+
+
   def test_models_label
     assert_equal 'Crud Test Models', @controller.models_label
     assert_equal 'Crud Test Model', @controller.models_label(false)
@@ -189,7 +295,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   def test_entry
     crud_test_models(:AAAAA)
   end
-  
+
   def test_entry_attrs
     {:name => 'foo',
      :children => 42,

data/lib/generators/dry_crud/templates/test/unit/custom_assertions_test.rb

@@ -10,11 +10,11 @@ class CustomAssertionsTest < ActiveSupport::TestCase
 
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
-  
-  AssertionException = RUBY_VERSION.to_f == 1.9 ? 
-                        MiniTest::Assertion : 
+
+  AssertionException = RUBY_VERSION.to_f == 1.9 ?
+                        MiniTest::Assertion :
                         Test::Unit::AssertionFailedError
-  
+
   test "assert include succeeds if included" do
     assert_nothing_raised do
       assert_include [1,2,3], 2

data/lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb

@@ -14,6 +14,8 @@ class CrudHelperTest < ActionView::TestCase
   include ListHelper
   include CrudTestHelper
 
+  attr_reader :entries
+
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
 
@@ -78,7 +80,7 @@ class CrudHelperTest < ActionView::TestCase
       capture { crud_form }
     end
 
-    assert_match /form .*?action="\/crud_test_models\/#{@entry.id}"/, f
+    assert_match /form .*?action="\/crud_test_models\/#{entry.id}"/, f
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text"/, f
     assert_match /input .*?name="crud_test_model\[whatever\]" .*?type="text"/, f
     assert_match /input .*?name="crud_test_model\[children\]" .*?type="number"/, f
@@ -89,7 +91,7 @@ class CrudHelperTest < ActionView::TestCase
     assert_match /select .*?name="crud_test_model\[companion_id\]"/, f
     assert_match /textarea .*?name="crud_test_model\[remarks\]"/, f
   end
-  
+
   def entry
     @entry ||= CrudTestModel.first
   end

data/lib/generators/dry_crud/templates/test/unit/helpers/list_helper_test.rb

@@ -12,6 +12,8 @@ class ListHelperTest < ActionView::TestCase
   include CrudTestHelper
   include CustomAssertions
 
+  attr_reader :entries
+
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
 

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_form_builder_test.rb

@@ -53,19 +53,29 @@ class StandardFormBuilderTest < ActionView::TestCase
     assert form.belongs_to_field(:companion_id).html_safe?
   end
 
+  test "input_field dispatches has_and_belongs_to_many attr to select field" do
+    assert_equal form.has_many_field(:other_ids), form.input_field(:other_ids)
+    assert form.has_many_field(:other_ids).html_safe?
+  end
+
+  test "input_field dispatches has_many attr to select field" do
+    assert_equal form.has_many_field(:more_ids), form.input_field(:more_ids)
+    assert form.has_many_field(:more_ids).html_safe?
+  end
+
   test "input_fields concats multiple fields" do
-  	result = form.labeled_input_fields(:name, :remarks, :children)
-  	assert result.html_safe?
-  	assert result.include?(form.input_field(:name))
-  	assert result.include?(form.input_field(:remarks))
-  	assert result.include?(form.input_field(:children))
+    result = form.labeled_input_fields(:name, :remarks, :children)
+    assert result.html_safe?
+    assert result.include?(form.input_field(:name))
+    assert result.include?(form.input_field(:remarks))
+    assert result.include?(form.input_field(:children))
   end
 
   test "labeld_input_field adds required mark" do
-  	result = form.labeled_input_field(:name)
-  	assert result.include?(StandardFormBuilder::REQUIRED_MARK)
-  	result = form.labeled_input_field(:remarks)
-  	assert !result.include?(StandardFormBuilder::REQUIRED_MARK)
+    result = form.labeled_input_field(:name)
+    assert result.include?(StandardFormBuilder::REQUIRED_MARK)
+    result = form.labeled_input_field(:remarks)
+    assert !result.include?(StandardFormBuilder::REQUIRED_MARK)
   end
 
   test "belongs_to_field has all options by default" do
@@ -93,18 +103,68 @@ class StandardFormBuilderTest < ActionView::TestCase
     assert_equal 0, f.scan('</option>').size
   end
 
+  test "has_and_belongs_to_many_field has all options by default" do
+    f = form.has_many_field(:other_ids)
+    assert_equal 6, f.scan('</option>').size
+  end
+
+  test "has_and_belongs_to_many_field with :list option" do
+    list = OtherCrudTestModel.all
+    f = form.has_many_field(:other_ids, :list => [list.first, list.second])
+    assert_equal 2, f.scan('</option>').size
+  end
+
+  test "has_and_belongs_to_many_field with instance variable" do
+    list = OtherCrudTestModel.all
+    @others = [list.first, list.second]
+    f = form.has_many_field(:other_ids)
+    assert_equal 2, f.scan('</option>').size
+  end
+
+  test "has_and_belongs_to_many_field with empty list" do
+    @others = []
+    f = form.has_many_field(:other_ids)
+    assert_match /none available/m, f
+    assert_equal 0, f.scan('</option>').size
+  end
+
+  test "has_many_field has all options by default" do
+    f = form.has_many_field(:more_ids)
+    assert_equal 6, f.scan('</option>').size
+  end
+
+  test "has_many_field with :list option" do
+    list = OtherCrudTestModel.all
+    f = form.has_many_field(:more_ids, :list => [list.first, list.second])
+    assert_equal 2, f.scan('</option>').size
+  end
+
+  test "has_many_field with instance variable" do
+    list = OtherCrudTestModel.all
+    @mores = [list.first, list.second]
+    f = form.has_many_field(:more_ids)
+    assert_equal 2, f.scan('</option>').size
+  end
+
+  test "has_many_field with empty list" do
+    @mores = []
+    f = form.has_many_field(:more_ids)
+    assert_match /none available/m, f
+    assert_equal 0, f.scan('</option>').size
+  end
+
   test "string_field sets maxlength attribute if limit" do
     assert_match /maxlength="50"/, form.string_field(:name)
   end
 
   test "label creates captionized label" do
-  	assert_match /label [^>]*for.+Gugus dada/, form.label(:gugus_dada)
-  	assert form.label(:gugus_dada).html_safe?
+    assert_match /label [^>]*for.+Gugus dada/, form.label(:gugus_dada)
+    assert form.label(:gugus_dada).html_safe?
   end
 
   test "classic label still works" do
-  	assert_match /label [^>]*for.+hoho/, form.label(:gugus_dada, "hoho")
-  	assert form.label(:gugus_dada, "hoho").html_safe?
+    assert_match /label [^>]*for.+hoho/, form.label(:gugus_dada, "hoho")
+    assert form.label(:gugus_dada, "hoho").html_safe?
   end
 
   test "labeled_text_field create label" do
@@ -113,9 +173,27 @@ class StandardFormBuilderTest < ActionView::TestCase
   end
 
   test "labeled field creates label" do
-  	result = form.labeled("gugus", "<input type='text' name='gugus' />")
-  	assert result.html_safe?
-  	assert_match /label [^>]*for.+input/m, result
+    result = form.labeled("gugus", "<input type='text' name='gugus' />".html_safe)
+    assert result.html_safe?
+    assert_match /label [^>]*for.+<input/m, result
+  end
+
+  test "labeled field creates label and block" do
+    result = form.labeled("gugus") { "<input type='text' name='gugus' />".html_safe }
+    assert result.html_safe?
+    assert_match /label [^>]*for.+<input/m, result
+  end
+
+  test "labeled field creates label with caption" do
+    result = form.labeled("gugus", 'Caption', "<input type='text' name='gugus' />".html_safe)
+    assert result.html_safe?
+    assert_match /label [^>]*for.+>Caption<\/label>.*<input/m, result
+  end
+
+  test "labeled field creates label with caption and block" do
+    result = form.labeled("gugus", 'Caption') { "<input type='text' name='gugus' />".html_safe }
+    assert result.html_safe?
+    assert_match /label [^>]*for.+>Caption<\/label>.*<input/m, result
   end
 
   test "required mark is shown" do