dry_crud 6.0.0 → 8.0.0

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

@@ -1,7 +1,6 @@
-require 'rails_helper'
-
-describe 'DryCrud::Form::Builder' do
+require "rails_helper"
 
+describe "DryCrud::Form::Builder" do
   include FormatHelper
   include FormHelper
   include UtilityHelper
@@ -19,12 +18,11 @@ describe 'DryCrud::Form::Builder' do
   let(:entry) { CrudTestModel.first }
   let(:form)  { DryCrud::Form::Builder.new(:entry, entry, self, {}) }
 
-  describe '#input_field' do
-
-    it 'dispatches name attr to string field' do
+  describe "#input_field" do
+    it "dispatches name attr to string field" do
       expect(form).to receive(:string_field)
-        .with(:name, required: 'required')
-        .and_return('<input>')
+        .with(:name, required: "required")
+        .and_return("<input>")
       form.input_field(:name)
     end
 
@@ -42,140 +40,138 @@ describe 'DryCrud::Form::Builder' do
       other_ids: :has_many_field,
       more_ids: :has_many_field }.each do |attr, method|
       it "dispatches #{attr} attr to #{method}" do
-        expect(form).to receive(method).with(attr, {})
+        expect(form).to receive(method).with(attr)
         form.input_field(attr)
       end
 
       it { expect(form.input_field(attr)).to be_html_safe }
     end
-
   end
 
-  describe '#labeled_input_fields' do
+  describe "#labeled_input_fields" do
     subject { form.labeled_input_fields(:name, :remarks, :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(: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
+  describe "#labeled_input_field" do
+    context "when required" do
       subject { form.labeled_input_field(:name) }
-      it { is_expected.to include('input-group-append') }
+      it { is_expected.to include("input-group-text") }
     end
 
-    context 'when not required' do
+    context "when not required" do
       subject { form.labeled_input_field(:remarks) }
-      it { is_expected.not_to include('input-group-append') }
+      it { is_expected.not_to include("input-group-text") }
     end
 
-    context 'with help text' do
-      subject { form.labeled_input_field(:name, help: 'Some Help') }
-      it { is_expected.to include(form.help_block('Some Help')) }
+    context "with help text" do
+      subject { form.labeled_input_field(:name, help: "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
+  describe "#belongs_to_field" do
+    it "has all options by default" do
       f = form.belongs_to_field(:companion_id)
       expect_n_options(f, 7)
     end
 
-    it 'with has options from :list option' do
+    it "with has options from :list option" do
       list = CrudTestModel.all
       f = form.belongs_to_field(:companion_id,
-                                list: [list.first, list.second])
+                                list: [ list.first, list.second ])
       expect_n_options(f, 3)
     end
 
-    it 'with empty instance list has no select' do
+    it "with empty instance list has no select" do
       assign(:companions, [])
       @companions = []
       f = form.belongs_to_field(:companion_id)
-      expect(f).to match t('global.associations.none_available')
+      expect(f).to match t("global.associations.none_available")
       expect_n_options(f, 0)
     end
   end
 
-  describe '#has_and_belongs_to_many_field' do
+  describe "#has_and_belongs_to_many_field" do
     let(:others) { OtherCrudTestModel.all[0..1] }
 
-    it 'has all options by default' do
+    it "has all options by default" do
       f = form.has_many_field(:other_ids)
       expect_n_options(f, 6)
     end
 
-    it 'uses options from :list option if given' do
+    it "uses options from :list option if given" do
       f = form.has_many_field(:other_ids, list: others)
       expect_n_options(f, 2)
     end
 
-    it 'uses options form instance variable if given' do
+    it "uses options form instance variable if given" do
       assign(:others, others)
       @others = others
       f = form.has_many_field(:other_ids)
       expect_n_options(f, 2)
     end
 
-    it 'displays a message for an empty list' do
+    it "displays a message for an empty list" do
       @others = []
       f = form.has_many_field(:other_ids)
-      expect(f).to match t('global.associations.none_available')
+      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
+  describe "#string_field" do
+    it "sets maxlength if attr has a limit" do
       expect(form.string_field(:name)).to match(/maxlength="50"/)
     end
   end
 
-  describe '#label' do
-    context 'only with attr' do
+  describe "#label" do
+    context "only with attr" do
       subject { form.label(:gugus_dada) }
 
       it { is_expected.to be_html_safe }
-      it 'provides the same interface as rails' do
+      it "provides the same interface as rails" do
         is_expected.to match(/label [^>]*for.+Gugus dada/)
       end
     end
 
-    context 'with attr and text' do
-      subject { form.label(:gugus_dada, 'hoho') }
+    context "with attr and text" do
+      subject { form.label(:gugus_dada, "hoho") }
 
       it { is_expected.to be_html_safe }
-      it 'provides the same interface as rails' do
+      it "provides the same interface as rails" do
         is_expected.to match(/label [^>]*for.+hoho/)
       end
     end
-
   end
 
-  describe '#labeled' do
-    context 'in labeled_ method' do
+  describe "#labeled" do
+    context "in labeled_ method" do
       subject { form.labeled_string_field(:name) }
 
       it { is_expected.to be_html_safe }
-      it 'provides the same interface as rails' do
+      it "provides the same interface as rails" do
         is_expected.to match(/label [^>]*for.+input/m)
       end
     end
 
-    context 'with custom content in argument' do
+    context "with custom content in argument" do
       subject do
-        form.labeled('gugus', "<input type='text' name='gugus' />".html_safe)
+        form.labeled("gugus", "<input type='text' name='gugus' />".html_safe)
       end
 
       it { is_expected.to be_html_safe }
       it { is_expected.to match(/label [^>]*for.+<input/m) }
     end
 
-    context 'with custom content in block' do
+    context "with custom content in block" do
       subject do
-        form.labeled('gugus') do
+        form.labeled("gugus") do
           "<input type='text' name='gugus' />".html_safe
         end
       end
@@ -184,20 +180,20 @@ describe 'DryCrud::Form::Builder' do
       it { is_expected.to match(/label [^>]*for.+<input/m) }
     end
 
-    context 'with caption and content in argument' do
+    context "with caption and content in argument" do
       subject do
-        form.labeled('gugus',
+        form.labeled("gugus",
                      "<input type='text' name='gugus' />".html_safe,
-                     caption: 'Caption')
+                     caption: "Caption")
       end
 
       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
+    context "with caption and content in block" do
       subject do
-        form.labeled('gugus', caption: 'Caption') do
+        form.labeled("gugus", caption: "Caption") do
           "<input type='text' name='gugus' />".html_safe
         end
       end
@@ -207,26 +203,25 @@ describe 'DryCrud::Form::Builder' do
     end
   end
 
-  it 'handles missing methods' do
+  it "handles missing methods" do
     expect { form.blabla }.to raise_error(NoMethodError)
   end
 
-  context '#respond_to?' do
-    it 'returns false for non existing methods' do
+  context "#respond_to?" do
+    it "returns false for non existing methods" do
       expect(form.respond_to?(:blabla)).to be false
     end
 
-    it 'returns true for existing methods' do
+    it "returns true for existing methods" do
       expect(form.respond_to?(:text_field)).to be true
     end
 
-    it 'returns true for labeled_ methods' do
+    it "returns true for labeled_ methods" do
       expect(form.respond_to?(:labeled_text_field)).to be true
     end
   end
 
   def expect_n_options(form, count)
-    expect(form.scan('</option>').size).to eq(count)
+    expect(form.scan("</option>").size).to eq(count)
   end
-
 end

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

@@ -1,54 +1,53 @@
-require 'rails_helper'
-
-describe 'DryCrud::Table::Builder' do
+require "rails_helper"
 
+describe "DryCrud::Table::Builder" do
   include FormatHelper
   include UtilityHelper
 
   let(:entries) { %w[foo bahr] }
   let(:table)   { DryCrud::Table::Builder.new(entries, self) }
 
-  def format_size(obj) #:nodoc:
+  def format_size(obj) # :nodoc:
     "#{obj.size} chars"
   end
 
-  specify '#html_header' do
+  specify "#html_header" do
     table.attrs :upcase, :size
-    dom = '<tr><th>Upcase</th><th>Size</th></tr>'
+    dom = "<tr><th>Upcase</th><th>Size</th></tr>"
     assert_dom_equal dom, table.send(:html_header)
   end
 
-  specify 'single attr row' do
+  specify "single attr row" do
     table.attrs :upcase, :size
-    dom = '<tr><td>FOO</td><td>3 chars</td></tr>'
+    dom = "<tr><td>FOO</td><td>3 chars</td></tr>"
     assert_dom_equal dom, table.send(:html_row, entries.first)
   end
 
-  specify 'custom row' do
-    table.col('Header', class: 'hula') { |e| "Weights #{e.size} kg" }
+  specify "custom row" do
+    table.col("Header", class: "hula") { |e| "Weights #{e.size} kg" }
     dom = '<tr><td class="hula">Weights 3 kg</td></tr>'
     assert_dom_equal dom, table.send(:html_row, entries.first)
   end
 
-  context 'attr col' do
+  context "attr col" do
     let(:col) { table.cols.first }
 
-    context 'output' do
+    context "output" do
       before { table.attrs :upcase }
 
-      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>') }
+      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
+    context "content with custom format_size method" do
       before { table.attrs :size }
 
-      it { expect(col.content('abcd')).to eq('4 chars') }
+      it { expect(col.content("abcd")).to eq("4 chars") }
     end
   end
 
-  specify 'two x two table' do
+  specify "two x two table" do
     dom = <<-FIN
       <table>
       <thead>
@@ -60,14 +59,14 @@ describe 'DryCrud::Table::Builder' do
       </tbody>
       </table>
     FIN
-    dom.gsub!(/[\n\t]/, '').gsub!(/\s{2,}/, '')
+    dom.gsub!(/[\n\t]/, "").gsub!(/\s{2,}/, "")
 
     table.attrs :upcase, :size
 
     assert_dom_equal dom, table.to_html
   end
 
-  specify 'table with before and after cells' do
+  specify "table with before and after cells" do
     dom = <<-FIN
       <table>
       <thead>
@@ -89,16 +88,16 @@ describe 'DryCrud::Table::Builder' do
       </tbody>
       </table>
     FIN
-    dom.gsub!(/[\n\t]/, '').gsub!(/\s{2,}/, '')
+    dom.gsub!(/[\n\t]/, "").gsub!(/\s{2,}/, "")
 
-    table.col('head', class: 'left') { |e| link_to e, '/' }
+    table.col("head", class: "left") { |e| link_to e, "/" }
     table.attrs :upcase, :size
     table.col { |e| "Never #{e}" }
 
     assert_dom_equal dom, table.to_html
   end
 
-  specify 'empty entries collection renders empty table' do
+  specify "empty entries collection renders empty table" do
     dom = <<-FIN
       <table>
       <thead>
@@ -108,14 +107,13 @@ describe 'DryCrud::Table::Builder' do
       </tbody>
       </table>
     FIN
-    dom.gsub!(/[\n\t]/, '').gsub!(/\s{2,}/, '')
+    dom.gsub!(/[\n\t]/, "").gsub!(/\s{2,}/, "")
 
     table = DryCrud::Table::Builder.new([], self)
-    table.col('head', class: 'left') { |e| link_to e, '/' }
+    table.col("head", class: "left") { |e| link_to e, "/" }
     table.attrs :upcase, :size
     table.col { |e| "Never #{e}" }
 
     assert_dom_equal dom, table.to_html
   end
-
 end

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

@@ -1,7 +1,6 @@
-require 'rails_helper'
+require "rails_helper"
 
 describe FormHelper do
-
   include UtilityHelper
   include FormatHelper
   include I18nHelper
@@ -15,18 +14,18 @@ describe FormHelper do
 
   after(:all) { reset_db }
 
-  describe '#plain_form' do
+  describe "#plain_form" do
     subject do
       with_test_routing do
         capture do
-          plain_form(entry, html: { class: 'special' }) do |f|
+          plain_form(entry, html: { class: "special" }) do |f|
             f.labeled_input_fields :name, :birthdate
           end
         end
       end
     end
 
-    context 'for existing entry' do
+    context "for existing entry" do
       let(:entry) { crud_test_models(:AAAAA) }
 
       it do
@@ -55,20 +54,19 @@ describe FormHelper do
     end
   end
 
-  describe '#standard_form' do
-
+  describe "#standard_form" do
     subject do
       with_test_routing do
         capture do
           standard_form(entry,
                         :name, :children, :birthdate, :human,
-                        cancel_url: '/somewhere',
-                        html: { class: 'special' })
+                        cancel_url: "/somewhere",
+                        html: { class: "special" })
         end
       end
     end
 
-    context 'for existing entry' do
+    context "for existing entry" do
       let(:entry) { crud_test_models(:AAAAA) }
 
       it do
@@ -97,7 +95,7 @@ describe FormHelper do
 
       it do
         is_expected.to match(/input .*?type="number"
-                                    .*?value=\"9\"
+                                    .*?value="9"
                                     .*?name="crud_test_model\[children\]"/x)
       end
 
@@ -119,7 +117,7 @@ describe FormHelper do
       end
     end
 
-    context 'for invalid entry' do
+    context "for invalid entry" do
       let(:entry) do
         e = crud_test_models(:AAAAA)
         e.name = nil
@@ -132,9 +130,10 @@ describe FormHelper do
       end
 
       it do
-        is_expected.to match(/div\ class="form-group\ has-error"\>.*?
-                              \<input .*?type="text"
-                                      .*?name="crud_test_model\[name\]"/x)
+        is_expected.to match(/div\ class="row\ mb-3">.*?
+                              <input .*?class="is-invalid\ form-control"
+                                     .*?type="text"
+                                     .*?name="crud_test_model\[name\]"/x)
       end
 
       it do
@@ -145,7 +144,7 @@ describe FormHelper do
     end
   end
 
-  describe '#crud_form' do
+  describe "#crud_form" do
     let(:entry) { CrudTestModel.first }
     subject do
       with_test_routing { crud_form }
@@ -191,7 +190,7 @@ describe FormHelper do
     end
 
     it do
-      is_expected.to match(/input .*?type="datetime\-local"
+      is_expected.to match(/input .*?type="datetime-local"
                                   .*?name="crud_test_model\[last_seen\]"/x)
     end
 
@@ -214,5 +213,4 @@ describe FormHelper do
                             #{t('global.button.cancel')}<\/a>/x)
     end
   end
-
 end