dry_crud 2.1.1 → 2.1.2

data/lib/generators/dry_crud/templates/spec/helpers/dry_crud/form/builder_spec.rb

@@ -30,7 +30,7 @@ describe 'DryCrud::Form::Builder' do
 
     it 'dispatches name attr to string field' do
       form.should_receive(:string_field)
-          .with(:name, class: 'form-control', required: 'required')
+          .with(:name, required: 'required')
           .and_return('<input>')
       form.input_field(:name)
     end
@@ -47,10 +47,10 @@ describe 'DryCrud::Form::Builder' do
       last_seen: :datetime_field,
       companion_id: :belongs_to_field,
       other_ids: :has_many_field,
-      more_ids: :has_many_field,
+      more_ids: :has_many_field
     }.each do |attr, method|
       it 'dispatches #{attr} attr to #{method}' do
-        form.should_receive(method).with(attr, class: 'form-control')
+        form.should_receive(method).with(attr, {})
         form.input_field(attr)
       end
 
@@ -137,7 +137,7 @@ describe 'DryCrud::Form::Builder' do
 
   describe '#string_field' do
     it 'sets maxlength if attr has a limit' do
-      form.string_field(:name).should match /maxlength="50"/
+      form.string_field(:name).should match(/maxlength="50"/)
     end
   end
 
@@ -147,7 +147,7 @@ describe 'DryCrud::Form::Builder' do
 
       it { should be_html_safe }
       it 'provides the same interface as rails' do
-        should match /label [^>]*for.+Gugus dada/
+        should match(/label [^>]*for.+Gugus dada/)
       end
     end
 
@@ -156,7 +156,7 @@ describe 'DryCrud::Form::Builder' do
 
       it { should be_html_safe }
       it 'provides the same interface as rails' do
-        should match /label [^>]*for.+hoho/
+        should match(/label [^>]*for.+hoho/)
       end
     end
 
@@ -168,7 +168,7 @@ describe 'DryCrud::Form::Builder' do
 
       it { should be_html_safe }
       it 'provides the same interface as rails' do
-        should match /label [^>]*for.+input/m
+        should match(/label [^>]*for.+input/m)
       end
     end
 
@@ -178,7 +178,7 @@ describe 'DryCrud::Form::Builder' do
       end
 
       it { should be_html_safe }
-      it { should match /label [^>]*for.+<input/m }
+      it { should match(/label [^>]*for.+<input/m) }
     end
 
     context 'with custom content in block' do
@@ -189,7 +189,7 @@ describe 'DryCrud::Form::Builder' do
       end
 
       it { should be_html_safe }
-      it { should match /label [^>]*for.+<input/m }
+      it { should match(/label [^>]*for.+<input/m) }
     end
 
     context 'with caption and content in argument' do
@@ -200,7 +200,7 @@ describe 'DryCrud::Form::Builder' do
       end
 
       it { should be_html_safe }
-      it { should match /label [^>]*for.+>Caption<\/label>.*<input/m }
+      it { should match(/label [^>]*for.+>Caption<\/label>.*<input/m) }
     end
 
     context 'with caption and content in block' do
@@ -211,7 +211,7 @@ describe 'DryCrud::Form::Builder' do
       end
 
       it { should be_html_safe }
-      it { should match /label [^>]*for.+>Caption<\/label>.*<input/m }
+      it { should match(/label [^>]*for.+>Caption<\/label>.*<input/m) }
     end
   end
 

data/lib/generators/dry_crud/templates/spec/helpers/form_helper_spec.rb

@@ -153,60 +153,60 @@ describe FormHelper do
     end
 
     it do
-      should match /form .*?action="\/crud_test_models\/#{entry.id}"/
+      should match(/form .*?action="\/crud_test_models\/#{entry.id}"/)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[name\]"
-                          .*?type="text"/x
+      should match(/input .*?name="crud_test_model\[name\]"
+                          .*?type="text"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[whatever\]"
-                          .*?type="text"/x
+      should match(/input .*?name="crud_test_model\[whatever\]"
+                          .*?type="text"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[children\]"
-                          .*?type="number"/x
+      should match(/input .*?name="crud_test_model\[children\]"
+                          .*?type="number"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[rating\]"
-                          .*?type="number"/x
+      should match(/input .*?name="crud_test_model\[rating\]"
+                          .*?type="number"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[income\]"
-                          .*?type="number"/x
+      should match(/input .*?name="crud_test_model\[income\]"
+                          .*?type="number"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[birthdate\]"
-                          .*?type="date"/x
+      should match(/input .*?name="crud_test_model\[birthdate\]"
+                          .*?type="date"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[gets_up_at\]"
-                          .*?type="time"/x
+      should match(/input .*?name="crud_test_model\[gets_up_at\]"
+                          .*?type="time"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[last_seen\]"
-                          .*?type="datetime"/x
+      should match(/input .*?name="crud_test_model\[last_seen\]"
+                          .*?type="datetime"/x)
     end
 
     it do
-      should match /input .*?name="crud_test_model\[human\]"
-                          .*?type="checkbox"/x
+      should match(/input .*?name="crud_test_model\[human\]"
+                          .*?type="checkbox"/x)
     end
 
     it do
-      should match /select .*?name="crud_test_model\[companion_id\]"/
+      should match(/select .*?name="crud_test_model\[companion_id\]"/)
     end
 
     it do
-      should match /textarea .*?name="crud_test_model\[remarks\]"/
+      should match(/textarea .*?name="crud_test_model\[remarks\]"/)
     end
 
     it do

data/lib/generators/dry_crud/templates/spec/helpers/format_helper_spec.rb

@@ -29,9 +29,10 @@ describe FormatHelper do
       subject { labeled('label') { 'value' } }
 
       it { should be_html_safe }
-      its(:squish) do
-        should =~ /^<dt>label<\/dt>
-                   \ <dd\ class=['"]value['"]>value<\/dd>$/x
+      it do
+        subject.squish.should =~
+          /^<dt>label<\/dt>
+           \ <dd\ class=['"]value['"]>value<\/dd>$/x
       end
     end
 
@@ -39,11 +40,12 @@ describe FormatHelper do
       subject { labeled('label') { '' } }
 
       it { should be_html_safe }
-      its(:squish) do
-        should =~ /<dt>label<\/dt>
-                   \ <dd\ class=['"]value['"]>
-                   #{UtilityHelper::EMPTY_STRING}
-                   <\/dd>$/x
+      it do
+        subject.squish.should =~
+          /<dt>label<\/dt>
+           \ <dd\ class=['"]value['"]>
+           #{UtilityHelper::EMPTY_STRING}
+           <\/dd>$/x
       end
     end
 
@@ -51,11 +53,12 @@ describe FormatHelper do
       subject { labeled('label') { 'value <unsafe>' } }
 
       it { should be_html_safe }
-      its(:squish) do
-        should =~ /<dt>label<\/dt>
-                   \ <dd\ class=['"]value['"]>
-                   value\ &lt;unsafe&gt;
-                   <\/dd>$/x
+      it do
+        subject.squish.should =~
+          /<dt>label<\/dt>
+           \ <dd\ class=['"]value['"]>
+           value\ &lt;unsafe&gt;
+           <\/dd>$/x
       end
     end
   end
@@ -64,9 +67,10 @@ describe FormatHelper do
     subject { labeled_attr('foo', :size) }
 
     it { should be_html_safe }
-    its(:squish) do
-      should =~ /<dt>Size<\/dt>
-                 \ <dd\ class=['"]value['"]>3\ chars<\/dd>$/x
+    it do
+      subject.squish.should =~
+        /<dt>Size<\/dt>
+         \ <dd\ class=['"]value['"]>3\ chars<\/dd>$/x
     end
   end
 
@@ -83,7 +87,7 @@ describe FormatHelper do
         end
 
         it 'adds delimiters' do
-          f(12345.6789).should == '12,345.679'
+          f(12_345.6789).should == '12,345.679'
         end
       end
 

data/lib/generators/dry_crud/templates/spec/support/crud_controller_examples.rb

@@ -107,7 +107,7 @@ shared_examples 'crud controller' do |options|
             combine: 'ij' do
       it_should_respond
       it_should_assign_entries
-      its(:body) { should start_with('[{') }
+      it { response.body.should start_with('[{') }
     end
   end
 
@@ -145,7 +145,7 @@ shared_examples 'crud controller' do |options|
             combine: 'sj' do
       it_should_respond
       it_should_assign_entry
-      its(:body) { should start_with('{') }
+      it_should_render_json
     end
   end
 
@@ -208,7 +208,7 @@ shared_examples 'crud controller' do |options|
               combine: 'cjv' do
         it_should_respond(201)
         it_should_set_attrs(:new)
-        its(:body) { should start_with('{') }
+        it_should_render_json
       end
 
       context 'with invalid params',
@@ -217,7 +217,7 @@ shared_examples 'crud controller' do |options|
               combine: 'cji' do
         it_should_respond(422)
         it_should_set_attrs(:new)
-        its(:body) { should match(/"errors":\{/) }
+        it_should_render_error_json
         it_should_persist_entry(false)
       end
     end
@@ -272,7 +272,7 @@ shared_examples 'crud controller' do |options|
               combine: 'ujv' do
         it_should_respond(204)
         it_should_set_attrs(:edit)
-        its(:body) { should match(/s*/) }
+        it { response.body.should be_blank }
         it_should_persist_entry
       end
 
@@ -282,7 +282,7 @@ shared_examples 'crud controller' do |options|
               combine: 'uji' do
         it_should_respond(422)
         it_should_set_attrs(:edit)
-        its(:body) { should match(/"errors":\{/) }
+        it_should_render_error_json
       end
     end
   end
@@ -316,12 +316,12 @@ shared_examples 'crud controller' do |options|
 
       context 'successfull', combine: 'djs' do
         it_should_respond(204)
-        its(:body) { should match(/s*/) }
+        it { response.body.should be_blank }
       end
 
       context 'with failure', failing: true, combine: 'djf' do
         it_should_respond(422)
-        its(:body) { should match(/"errors":\{/) }
+        it_should_render_error_json
       end
     end
   end

data/lib/generators/dry_crud/templates/spec/support/crud_controller_test_helper.rb

@@ -89,7 +89,7 @@ module CrudControllerTestHelper
 
     # Test the response status, default 200.
     def it_should_respond(status = 200)
-      its(:status) { should == status }
+      it { response.status.should == status }
     end
 
     # Test that entries are assigned.
@@ -112,6 +112,16 @@ module CrudControllerTestHelper
       it { should render_template(template || example.metadata[:action]) }
     end
 
+    # Test that a json response is rendered.
+    def it_should_render_json
+      it { response.body.should start_with('{') }
+    end
+
+    # Test that a json response containing the error is rendered.
+    def it_should_render_error_json
+      it { response.body.should match(/"errors":\{/) }
+    end
+
     # Test that test_entry_attrs are set on entry.
     def it_should_set_attrs(action = nil)
       it 'should set params as entry attributes' do

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

@@ -149,7 +149,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_create
     super
-    assert_match /model got created/, flash[:notice]
+    assert_match(/model got created/, flash[:notice])
     assert flash[:alert].blank?
     assert_equal [:before_create, :before_save, :after_save, :after_create],
                  @controller.called_callbacks
@@ -234,7 +234,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     end
     assert_response :unprocessable_entity
     assert entry.new_record?
-    assert_match /errors/, @response.body
+    assert_match(/errors/, @response.body)
     assert_equal [:before_create, :before_save], @controller.called_callbacks
   end
 
@@ -257,7 +257,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
                  format: 'json'
     assert_response :unprocessable_entity
     assert entry.changed?
-    assert_match /errors/, @response.body
+    assert_match(/errors/, @response.body)
     assert flash[:notice].blank?
     assert_equal 20, entry.rating
     assert_equal [:before_update, :before_save], @controller.called_callbacks
@@ -270,7 +270,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
       delete :destroy, test_params(id: crud_test_models(:BBBBB).id)
     end
     assert_redirected_to_show(entry)
-    assert_match /companion/, flash[:alert]
+    assert_match(/companion/, flash[:alert])
     assert flash[:notice].blank?
   end
 
@@ -281,7 +281,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
       delete :destroy, test_params(id: e.id)
     end
     assert_redirected_to_index
-    assert_match /illegal name/, flash[:alert]
+    assert_match(/illegal name/, flash[:alert])
     assert flash[:notice].blank?
   end
 
@@ -291,7 +291,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
                                    format: 'json')
     end
     assert_response :unprocessable_entity
-    assert_match /errors/, @response.body
+    assert_match(/errors/, @response.body)
     assert flash[:notice].blank?
   end
 

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

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'test_helper'
 require 'support/custom_assertions'
+require 'support/crud_test_helper'
 require 'support/crud_test_model'
 
 # Test CustomAssertions

data/lib/generators/dry_crud/templates/test/helpers/dry_crud/form/builder_test.rb

@@ -2,251 +2,256 @@
 require 'test_helper'
 require 'support/crud_test_model'
 
-# Test DryCrud::Form::Builder
-class DryCrud::Form::BuilderTest < ActionView::TestCase
-
-  include FormatHelper
-  include I18nHelper
-  include CrudTestHelper
-
-  # set dummy helper class for ActionView::TestCase
-  self.helper_class = UtilityHelper
-
-  attr_reader :form, :entry
-
-  setup :reset_db, :setup_db, :create_test_data, :create_form
-  teardown :reset_db
-
-  def create_form
-    @entry = CrudTestModel.first
-    if Rails.version < '4.0'
-      @form = DryCrud::Form::Builder.new(:entry, @entry, self, {},
-                                    ->(form) { form })
-    else
-      @form = DryCrud::Form::Builder.new(:entry, @entry, self, {})
-    end
-  end
-
-  test 'input_field dispatches string attr to string_field' do
-    assert_equal form.with_addon(
-                   form.string_field(:name,
-                                     class: 'form-control',
-                                     required: 'required'),
-                   '*'),
-                 form.input_field(:name)
-    assert form.string_field(:name).html_safe?
-  end
-
-  test 'input_field dispatches password attr to password_field' do
-    assert_equal form.password_field(:password, class: 'form-control'),
-                 form.input_field(:password)
-    assert form.password_field(:name).html_safe?
-  end
-
-  test 'input_field dispatches email attr to email_field' do
-    assert_equal form.email_field(:email, class: 'form-control'),
-                 form.input_field(:email)
-    assert form.email_field(:name).html_safe?
-  end
-
-  test 'input_field dispatches text attr to text_area' do
-    assert_equal form.text_area(:remarks, class: 'form-control'),
-                 form.input_field(:remarks)
-    assert form.text_area(:remarks).html_safe?
-  end
-
-  test 'input_field dispatches integer attr to integer_field' do
-    assert_equal form.integer_field(:children, class: 'form-control'),
-                 form.input_field(:children)
-    assert form.integer_field(:children).html_safe?
-  end
-
-  test 'input_field dispatches boolean attr to boolean_field' do
-    assert_equal form.boolean_field(:human, class: 'form-control'),
-                 form.input_field(:human)
-    assert form.boolean_field(:human).html_safe?
-  end
-
-  test 'input_field dispatches date attr to date_field' do
-    assert_equal form.date_field(:birthdate, class: 'form-control'),
-                 form.input_field(:birthdate)
-    assert form.date_field(:birthdate).html_safe?
-  end
-
-  test 'input_field dispatches belongs_to attr to select field' do
-    assert_equal form.belongs_to_field(:companion_id, class: 'form-control'),
-                 form.input_field(:companion_id)
-    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, class: 'form-control'),
-                 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, class: 'form-control'),
-                 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, required: 'required'))
-    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?('input-group-addon')
-    result = form.labeled_input_field(:remarks)
-    assert !result.include?('input-group-addon')
-  end
-
-  test 'labeld_input_field adds help text' do
-    result = form.labeled_input_field(:name, help: 'Some Help')
-    assert result.include?(form.help_block('Some Help'))
-    assert result.include?('input-group-addon')
-  end
-
-  test 'belongs_to_field has all options by default' do
-    f = form.belongs_to_field(:companion_id)
-    assert_equal 7, f.scan('</option>').size
-  end
-
-  test 'belongs_to_field with :list option' do
-    list = CrudTestModel.all
-    f = form.belongs_to_field(:companion_id,
-                              list: [list.first, list.second])
-    assert_equal 3, f.scan('</option>').size
-  end
-
-  test 'belongs_to_field with instance variable' do
-    list = CrudTestModel.all
-    @companions = [list.first, list.second]
-    f = form.belongs_to_field(:companion_id)
-    assert_equal 3, f.scan('</option>').size
-  end
-
-  test 'belongs_to_field with empty list' do
-    @companions = []
-    f = form.belongs_to_field(:companion_id)
-    assert_match t('global.associations.none_available'), f
-    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 t('global.associations.none_available'), 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 t('global.associations.none_available'), 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?
-  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?
-  end
-
-  test 'labeled_text_field create label' do
-    assert_match /label [^>]*for.+input/m, form.labeled_string_field(:name)
-    assert form.labeled_string_field(:name).html_safe?
-  end
-
-  test 'labeled field creates label' 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 and block' do
-    result = form.labeled('gugus') do
-      "<input type='text' name='gugus' />".html_safe
+module DryCrud
+  module Form
+    # Test DryCrud::Form::Builder
+    class BuilderTest < ActionView::TestCase
+
+      include FormatHelper
+      include I18nHelper
+      include CrudTestHelper
+
+      # set dummy helper class for ActionView::TestCase
+      self.helper_class = UtilityHelper
+
+      attr_reader :form, :entry
+
+      setup :reset_db, :setup_db, :create_test_data, :create_form
+      teardown :reset_db
+
+      def create_form
+        @entry = CrudTestModel.first
+        if Rails.version < '4.0'
+          @form = DryCrud::Form::Builder.new(:entry, @entry, self, {},
+                                             ->(form) { form })
+        else
+          @form = DryCrud::Form::Builder.new(:entry, @entry, self, {})
+        end
+      end
+
+      test 'input_field dispatches string attr to string_field' do
+        assert_equal form.with_addon(
+                       form.string_field(:name,
+                                         required: 'required'),
+                       '*'),
+                     form.input_field(:name)
+        assert form.string_field(:name).html_safe?
+      end
+
+      test 'input_field dispatches password attr to password_field' do
+        assert_equal form.password_field(:password),
+                     form.input_field(:password)
+        assert form.password_field(:name).html_safe?
+      end
+
+      test 'input_field dispatches email attr to email_field' do
+        assert_equal form.email_field(:email),
+                     form.input_field(:email)
+        assert form.email_field(:name).html_safe?
+      end
+
+      test 'input_field dispatches text attr to text_area' do
+        assert_equal form.text_area(:remarks),
+                     form.input_field(:remarks)
+        assert form.text_area(:remarks).html_safe?
+      end
+
+      test 'input_field dispatches integer attr to integer_field' do
+        assert_equal form.integer_field(:children),
+                     form.input_field(:children)
+        assert form.integer_field(:children).html_safe?
+      end
+
+      test 'input_field dispatches boolean attr to boolean_field' do
+        assert_equal form.boolean_field(:human),
+                     form.input_field(:human)
+        assert form.boolean_field(:human).html_safe?
+      end
+
+      test 'input_field dispatches date attr to date_field' do
+        assert_equal form.date_field(:birthdate),
+                     form.input_field(:birthdate)
+        assert form.date_field(:birthdate).html_safe?
+      end
+
+      test 'input_field dispatches belongs_to attr to select field' do
+        assert_equal form.belongs_to_field(:companion_id),
+                     form.input_field(:companion_id)
+        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, required: 'required'))
+        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?('input-group-addon')
+        result = form.labeled_input_field(:remarks)
+        assert !result.include?('input-group-addon')
+      end
+
+      test 'labeld_input_field adds help text' do
+        result = form.labeled_input_field(:name, help: 'Some Help')
+        assert result.include?(form.help_block('Some Help'))
+        assert result.include?('input-group-addon')
+      end
+
+      test 'belongs_to_field has all options by default' do
+        f = form.belongs_to_field(:companion_id)
+        assert_equal 7, f.scan('</option>').size
+      end
+
+      test 'belongs_to_field with :list option' do
+        list = CrudTestModel.all
+        f = form.belongs_to_field(:companion_id,
+                                  list: [list.first, list.second])
+        assert_equal 3, f.scan('</option>').size
+      end
+
+      test 'belongs_to_field with instance variable' do
+        list = CrudTestModel.all
+        @companions = [list.first, list.second]
+        f = form.belongs_to_field(:companion_id)
+        assert_equal 3, f.scan('</option>').size
+      end
+
+      test 'belongs_to_field with empty list' do
+        @companions = []
+        f = form.belongs_to_field(:companion_id)
+        assert_match t('global.associations.none_available'), f
+        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 t('global.associations.none_available'), 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 t('global.associations.none_available'), 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?
+      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?
+      end
+
+      test 'labeled_text_field create label' do
+        assert_match(/label [^>]*for.+input/m,
+                     form.labeled_string_field(:name))
+        assert form.labeled_string_field(:name).html_safe?
+      end
+
+      test 'labeled field creates label' 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 and block' do
+        result = form.labeled('gugus') do
+          "<input type='text' name='gugus' />".html_safe
+        end
+        assert result.html_safe?
+        assert_match(/label [^>]*for.+<input/m, result)
+      end
+
+      test 'labeled field creates label with caption' do
+        result = form.labeled('gugus',
+                              "<input type='text' name='gugus' />".html_safe,
+                              caption: 'Caption')
+        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: 'Caption') do
+          "<input type='text' name='gugus' />".html_safe
+        end
+        assert result.html_safe?
+        assert_match(/label [^>]*for.+>Caption<\/label>.*<input/m, result)
+      end
+
+      test 'method missing still works' do
+        assert_raise(NoMethodError) do
+          form.blabla
+        end
+      end
+
+      test 'respond to still works' do
+        assert !form.respond_to?(:blalba)
+        assert form.respond_to?(:text_field)
+        assert form.respond_to?(:labeled_text_field)
+      end
     end
-    assert result.html_safe?
-    assert_match /label [^>]*for.+<input/m, result
-  end
-
-  test 'labeled field creates label with caption' do
-    result = form.labeled('gugus',
-                          "<input type='text' name='gugus' />".html_safe,
-                          caption: 'Caption')
-    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: 'Caption') do
-      "<input type='text' name='gugus' />".html_safe
-    end
-    assert result.html_safe?
-    assert_match /label [^>]*for.+>Caption<\/label>.*<input/m, result
-  end
-
-  test 'method missing still works' do
-    assert_raise(NoMethodError) do
-      form.blabla
-    end
-  end
-
-  test 'respond to still works' do
-    assert !form.respond_to?(:blalba)
-    assert form.respond_to?(:text_field)
-    assert form.respond_to?(:labeled_text_field)
   end
 end