dry_crud 2.1.2 → 3.0.0

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

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'DryCrud::Form::Builder' do
 
@@ -18,24 +18,18 @@ describe 'DryCrud::Form::Builder' do
   after(:all) { reset_db }
 
   let(:entry) { CrudTestModel.first }
-  if Rails.version < '4.0'
-    let(:form)  do
-      DryCrud::Form::Builder.new(:entry, entry, self, {}, ->(form) { form })
-    end
-  else
-    let(:form)  { DryCrud::Form::Builder.new(:entry, entry, self, {}) }
-  end
+  let(:form)  { DryCrud::Form::Builder.new(:entry, entry, self, {}) }
 
   describe '#input_field' do
 
     it 'dispatches name attr to string field' do
-      form.should_receive(:string_field)
-          .with(:name, required: 'required')
-          .and_return('<input>')
+      expect(form).to receive(:string_field)
+        .with(:name, required: 'required')
+        .and_return('<input>')
       form.input_field(:name)
     end
 
-    it { form.input_field(:name).should be_html_safe }
+    it { expect(form.input_field(:name)).to be_html_safe }
 
     { password: :password_field,
       email: :email_field,
@@ -50,11 +44,11 @@ describe 'DryCrud::Form::Builder' do
       more_ids: :has_many_field
     }.each do |attr, method|
       it 'dispatches #{attr} attr to #{method}' do
-        form.should_receive(method).with(attr, {})
+        expect(form).to receive(method).with(attr, {})
         form.input_field(attr)
       end
 
-      it { form.input_field(attr).should be_html_safe }
+      it { expect(form.input_field(attr)).to be_html_safe }
     end
 
   end
@@ -62,48 +56,48 @@ describe 'DryCrud::Form::Builder' do
   describe '#labeled_input_fields' do
     subject { form.labeled_input_fields(:name, :remarks, :children) }
 
-    it { should be_html_safe }
-    it { should include(form.input_field(:name, required: 'required')) }
-    it { should include(form.input_field(:remarks)) }
-    it { should include(form.input_field(:children)) }
+    it { is_expected.to be_html_safe }
+    it { is_expected.to include(form.input_field(:name, required: 'required')) }
+    it { is_expected.to include(form.input_field(:remarks)) }
+    it { is_expected.to include(form.input_field(:children)) }
   end
 
   describe '#labeled_input_field' do
     context 'when required' do
       subject { form.labeled_input_field(:name) }
-      it { should include('input-group-addon') }
+      it { is_expected.to include('input-group-addon') }
     end
 
     context 'when not required' do
       subject { form.labeled_input_field(:remarks) }
-      it { should_not include('input-group-addon') }
+      it { is_expected.not_to include('input-group-addon') }
     end
 
     context 'with help text' do
       subject { form.labeled_input_field(:name, help: 'Some Help') }
-      it { should include(form.help_block('Some Help')) }
+      it { is_expected.to include(form.help_block('Some Help')) }
     end
   end
 
   describe '#belongs_to_field' do
     it 'has all options by default' do
       f = form.belongs_to_field(:companion_id)
-      f.scan('</option>').should have(7).items
+      expect_n_options(f, 7)
     end
 
     it 'with has options from :list option' do
       list = CrudTestModel.all
       f = form.belongs_to_field(:companion_id,
                                 list: [list.first, list.second])
-      f.scan('</option>').should have(3).items
+      expect_n_options(f, 3)
     end
 
     it 'with empty instance list has no select' do
       assign(:companions, [])
       @companions = []
       f = form.belongs_to_field(:companion_id)
-      f.should match t('global.associations.none_available')
-      f.scan('</option>').should have(0).items
+      expect(f).to match t('global.associations.none_available')
+      expect_n_options(f, 0)
     end
   end
 
@@ -112,32 +106,32 @@ describe 'DryCrud::Form::Builder' do
 
     it 'has all options by default' do
       f = form.has_many_field(:other_ids)
-      f.scan('</option>').should have(6).items
+      expect_n_options(f, 6)
     end
 
     it 'uses options from :list option if given' do
       f = form.has_many_field(:other_ids, list: others)
-      f.scan('</option>').should have(2).items
+      expect_n_options(f, 2)
     end
 
     it 'uses options form instance variable if given' do
       assign(:others, others)
       @others = others
       f = form.has_many_field(:other_ids)
-      f.scan('</option>').should have(2).items
+      expect_n_options(f, 2)
     end
 
     it 'displays a message for an empty list' do
       @others = []
       f = form.has_many_field(:other_ids)
-      f.should match t('global.associations.none_available')
-      f.scan('</option>').should have(0).items
+      expect(f).to match t('global.associations.none_available')
+      expect_n_options(f, 0)
     end
   end
 
   describe '#string_field' do
     it 'sets maxlength if attr has a limit' do
-      form.string_field(:name).should match(/maxlength="50"/)
+      expect(form.string_field(:name)).to match(/maxlength="50"/)
     end
   end
 
@@ -145,18 +139,18 @@ describe 'DryCrud::Form::Builder' do
     context 'only with attr' do
       subject { form.label(:gugus_dada) }
 
-      it { should be_html_safe }
+      it { is_expected.to be_html_safe }
       it 'provides the same interface as rails' do
-        should match(/label [^>]*for.+Gugus dada/)
+        is_expected.to match(/label [^>]*for.+Gugus dada/)
       end
     end
 
     context 'with attr and text' do
       subject { form.label(:gugus_dada, 'hoho') }
 
-      it { should be_html_safe }
+      it { is_expected.to be_html_safe }
       it 'provides the same interface as rails' do
-        should match(/label [^>]*for.+hoho/)
+        is_expected.to match(/label [^>]*for.+hoho/)
       end
     end
 
@@ -166,9 +160,9 @@ describe 'DryCrud::Form::Builder' do
     context 'in labeled_ method' do
       subject { form.labeled_string_field(:name) }
 
-      it { should be_html_safe }
+      it { is_expected.to be_html_safe }
       it 'provides the same interface as rails' do
-        should match(/label [^>]*for.+input/m)
+        is_expected.to match(/label [^>]*for.+input/m)
       end
     end
 
@@ -177,8 +171,8 @@ describe 'DryCrud::Form::Builder' do
         form.labeled('gugus', "<input type='text' name='gugus' />".html_safe)
       end
 
-      it { should be_html_safe }
-      it { should match(/label [^>]*for.+<input/m) }
+      it { is_expected.to be_html_safe }
+      it { is_expected.to match(/label [^>]*for.+<input/m) }
     end
 
     context 'with custom content in block' do
@@ -188,8 +182,8 @@ describe 'DryCrud::Form::Builder' do
         end
       end
 
-      it { should be_html_safe }
-      it { should match(/label [^>]*for.+<input/m) }
+      it { is_expected.to be_html_safe }
+      it { is_expected.to match(/label [^>]*for.+<input/m) }
     end
 
     context 'with caption and content in argument' do
@@ -199,8 +193,8 @@ describe 'DryCrud::Form::Builder' do
                      caption: 'Caption')
       end
 
-      it { should be_html_safe }
-      it { should match(/label [^>]*for.+>Caption<\/label>.*<input/m) }
+      it { is_expected.to be_html_safe }
+      it { is_expected.to match(/label [^>]*for.+>Caption<\/label>.*<input/m) }
     end
 
     context 'with caption and content in block' do
@@ -210,8 +204,8 @@ describe 'DryCrud::Form::Builder' do
         end
       end
 
-      it { should be_html_safe }
-      it { should match(/label [^>]*for.+>Caption<\/label>.*<input/m) }
+      it { is_expected.to be_html_safe }
+      it { is_expected.to match(/label [^>]*for.+>Caption<\/label>.*<input/m) }
     end
   end
 
@@ -221,15 +215,20 @@ describe 'DryCrud::Form::Builder' do
 
   context '#respond_to?' do
     it 'returns false for non existing methods' do
-      form.respond_to?(:blabla).should be_false
+      expect(form.respond_to?(:blabla)).to be false
     end
 
     it 'returns true for existing methods' do
-      form.respond_to?(:text_field).should be_true
+      expect(form.respond_to?(:text_field)).to be true
     end
 
     it 'returns true for labeled_ methods' do
-      form.respond_to?(:labeled_text_field).should be_true
+      expect(form.respond_to?(:labeled_text_field)).to be true
     end
   end
+
+  def expect_n_options(f, n)
+    expect(f.scan('</option>').size).to eq(n)
+  end
+
 end

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

@@ -1,7 +1,7 @@
 # encoding: UTF-8
-require 'spec_helper'
+require 'rails_helper'
 
-describe 'DryCrud::TableBuilder' do
+describe 'DryCrud::Table::Builder' do
 
   include FormatHelper
   include UtilityHelper
@@ -37,15 +37,15 @@ describe 'DryCrud::TableBuilder' do
     context 'output' do
       before { table.attrs :upcase }
 
-      it { col.html_header.should == '<th>Upcase</th>' }
-      it { col.content('foo').should == 'FOO' }
-      it { col.html_cell('foo').should == '<td>FOO</td>' }
+      it { expect(col.html_header).to eq('<th>Upcase</th>') }
+      it { expect(col.content('foo')).to eq('FOO') }
+      it { expect(col.html_cell('foo')).to eq('<td>FOO</td>') }
     end
 
     context 'content with custom format_size method' do
       before { table.attrs :size }
 
-      it { col.content('abcd').should == '4 chars' }
+      it { expect(col.content('abcd')).to eq('4 chars') }
     end
   end
 

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

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'spec_helper'
+require 'rails_helper'
 
 describe FormHelper do
 
@@ -31,27 +31,27 @@ describe FormHelper do
       let(:entry) { crud_test_models(:AAAAA) }
 
       it do
-        should match(/form .*?action="\/crud_test_models\/#{entry.id}"
-                           .*?class="special\ form-horizontal"
-                           .*?method="post"/x)
+        is_expected.to match(/form .*?class="special\ form-horizontal"
+                                   .*?action="\/crud_test_models\/#{entry.id}"
+                                   .*?method="post"/x)
       end
 
       it do
-        should match(/input .*?name="_method"
-                            .*?type="hidden"
-                            .*?value="(put|patch)"/x)
+        is_expected.to match(/input .*?type="hidden"
+                                    .*?name="_method"
+                                    .*?value="(put|patch)"/x)
       end
 
       it do
-        should match(/input .*?name="crud_test_model\[name\]"
-                            .*?type="text"
-                            .*?value="AAAAA"/x)
+        is_expected.to match(/input .*?type="text"
+                                    .*?value="AAAAA"
+                                    .*?name="crud_test_model\[name\]"/x)
       end
 
       it do
-        should match(/input .*?name="crud_test_model\[birthdate\]"
-                            .*?type="date"
-                            .*?value="1910-01-01"/x)
+        is_expected.to match(/input .*?value="1910-01-01"
+                                    .*?type="date"
+                                    .*?name="crud_test_model\[birthdate\]"/x)
       end
     end
   end
@@ -73,50 +73,50 @@ describe FormHelper do
       let(:entry) { crud_test_models(:AAAAA) }
 
       it do
-        should match(/form .*?action="\/crud_test_models\/#{entry.id}"
-                            .*?class="special\ form-horizontal"
-                            .*?method="post"/x)
+        is_expected.to match(/form .*?class="special\ form-horizontal"
+                                   .*?action="\/crud_test_models\/#{entry.id}"
+                                   .*?method="post"/x)
       end
 
       it do
-        should match(/input .*?name="_method"
-                            .*?type="hidden"
-                            .*?value="(put|patch)"/x)
+        is_expected.to match(/input .*?type="hidden"
+                                    .*?name="_method"
+                                    .*?value="(put|patch)"/x)
       end
 
       it do
-        should match(/input .*?name="crud_test_model\[name\]"
-                             .*?type="text"
-                             .*?value="AAAAA"/x)
+        is_expected.to match(/input .*?type="text"
+                                    .*?value="AAAAA"
+                                    .*?name="crud_test_model\[name\]"/x)
       end
 
       it do
-        should match(/input .*?name="crud_test_model\[birthdate\]"
-                             .*?type="date"
-                             .*?value="1910-01-01"/x)
+        is_expected.to match(/input .*?value="1910-01-01"
+                                    .*?type="date"
+                                    .*?name="crud_test_model\[birthdate\]"/x)
       end
 
       it do
-        should match(/input .*?name="crud_test_model\[children\]"
-                            .*?type="number"
-                            .*?value=\"9\"/x)
+        is_expected.to match(/input .*?type="number"
+                                    .*?value=\"9\"
+                                    .*?name="crud_test_model\[children\]"/x)
       end
 
       it do
-        should match(/input .*?name="crud_test_model\[human\]"
-                            .*?type="checkbox"/x)
+        is_expected.to match(/input .*?type="checkbox"
+                                    .*?name="crud_test_model\[human\]"/x)
       end
 
       it do
-        should match(/button\ .*?type="submit">
-                      #{t('global.button.save')}
-                      <\/button>/x)
+        is_expected.to match(/button\ .*?type="submit".*>
+                              #{t('global.button.save')}
+                              <\/button>/x)
       end
 
       it do
-        should match(/a\ .*href="\/somewhere".*>
-                      #{t('global.button.cancel')}
-                      <\/a>/x)
+        is_expected.to match(/a\ .*href="\/somewhere".*>
+                              #{t('global.button.cancel')}
+                              <\/a>/x)
       end
     end
 
@@ -129,19 +129,19 @@ describe FormHelper do
       end
 
       it do
-        should match(/div[^>]* id='error_explanation'/)
+        is_expected.to match(/div[^>]* id='error_explanation'/)
       end
 
       it do
-        should match(/div\ class="form-group\ has-error"\>.*?
-                      \<input .*?name="crud_test_model\[name\]"
-                              .*?type="text"/x)
+        is_expected.to match(/div\ class="form-group\ has-error"\>.*?
+                              \<input .*?type="text"
+                                      .*?name="crud_test_model\[name\]"/x)
       end
 
       it do
-        should match(/input .*?name="_method"
-                            .*?type="hidden"
-                            .*?value="(put|patch)"/x)
+        is_expected.to match(/input .*?type="hidden"
+                                    .*?name="_method"
+                                    .*?value="(put|patch)"/x)
       end
     end
   end
@@ -153,66 +153,66 @@ describe FormHelper do
     end
 
     it do
-      should match(/form .*?action="\/crud_test_models\/#{entry.id}"/)
+      is_expected.to match(/form .*?action="\/crud_test_models\/#{entry.id}"/)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[name\]"
-                          .*?type="text"/x)
+      is_expected.to match(/input .*?type="text"
+                                  .*?name="crud_test_model\[name\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[whatever\]"
-                          .*?type="text"/x)
+      is_expected.to match(/input .*?type="text"
+                                  .*?name="crud_test_model\[whatever\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[children\]"
-                          .*?type="number"/x)
+      is_expected.to match(/input .*?type="number"
+                                  .*?name="crud_test_model\[children\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[rating\]"
-                          .*?type="number"/x)
+      is_expected.to match(/input .*?type="number"
+                                  .*?name="crud_test_model\[rating\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[income\]"
-                          .*?type="number"/x)
+      is_expected.to match(/input .*?type="number"
+                                  .*?name="crud_test_model\[income\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[birthdate\]"
-                          .*?type="date"/x)
+      is_expected.to match(/input .*?type="date"
+                                  .*?name="crud_test_model\[birthdate\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[gets_up_at\]"
-                          .*?type="time"/x)
+      is_expected.to match(/input .*?type="time"
+                                  .*?name="crud_test_model\[gets_up_at\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[last_seen\]"
-                          .*?type="datetime"/x)
+      is_expected.to match(/input .*?type="datetime"
+                                  .*?name="crud_test_model\[last_seen\]"/x)
     end
 
     it do
-      should match(/input .*?name="crud_test_model\[human\]"
-                          .*?type="checkbox"/x)
+      is_expected.to match(/input .*?type="checkbox"
+                                  .*?name="crud_test_model\[human\]"/x)
     end
 
     it do
-      should match(/select .*?name="crud_test_model\[companion_id\]"/)
+      is_expected.to match(/select .*?name="crud_test_model\[companion_id\]"/)
     end
 
     it do
-      should match(/textarea .*?name="crud_test_model\[remarks\]"/)
+      is_expected.to match(/textarea .*?name="crud_test_model\[remarks\]"/)
     end
 
     it do
-      should match(/a\ .*href="\/crud_test_models\/#{entry.id}
+      is_expected.to match(/a\ .*href="\/crud_test_models\/#{entry.id}
                                \?returning=true".*>
-                    #{t('global.button.cancel')}<\/a>/x)
+                            #{t('global.button.cancel')}<\/a>/x)
     end
   end