dry_crud 5.0.0 → 5.2.0

data/lib/generators/dry_crud/templates/spec/controllers/crud_test_models_controller_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rails_helper'
 
 # Tests all actions of the CrudController based on a dummy model
@@ -91,7 +90,7 @@ describe CrudTestModelsController do
           it_is_expected_to_respond
 
           it 'entries have one item' do
-            expect(entries).to eq([CrudTestModel.find_by_name('BBBBB')])
+            expect(entries).to eq([CrudTestModel.find_by(name: 'BBBBB')])
           end
 
           it 'session has query list param' do
@@ -113,7 +112,8 @@ describe CrudTestModelsController do
 
           it 'session has sort list param' do
             expect(session[:list_params]['/crud_test_models.html']).to eq(
-              'sort' => 'children', 'sort_dir' => 'asc')
+              'sort' => 'children', 'sort_dir' => 'asc'
+            )
           end
         end
 
@@ -134,7 +134,8 @@ describe CrudTestModelsController do
 
           it 'session has sort list param' do
             expect(session[:list_params]['/crud_test_models.html']).to eq(
-              'sort' => 'chatty', 'sort_dir' => 'desc')
+              'sort' => 'chatty', 'sort_dir' => 'desc'
+            )
           end
         end
 
@@ -146,12 +147,13 @@ describe CrudTestModelsController do
           it_is_expected_to_respond
 
           it 'entries are in correct order' do
-            expect(entries.map(&:name)).to eq(%w(CCCCC DDDDD BBBBB))
+            expect(entries.map(&:name)).to eq(%w[CCCCC DDDDD BBBBB])
           end
 
           it 'session has sort list param' do
             expect(session[:list_params]['/crud_test_models.html']).to eq(
-              'q' => 'DDD', 'sort' => 'chatty', 'sort_dir' => 'asc')
+              'q' => 'DDD', 'sort' => 'chatty', 'sort_dir' => 'asc'
+            )
           end
         end
       end
@@ -179,7 +181,7 @@ describe CrudTestModelsController do
         it_is_expected_to_respond
 
         it 'entries are in correct order' do
-          expect(entries.map(&:name)).to eq(%w(BBBBB DDDDD CCCCC))
+          expect(entries.map(&:name)).to eq(%w[BBBBB DDDDD CCCCC])
         end
 
         it 'params are set' do
@@ -204,7 +206,8 @@ describe CrudTestModelsController do
 
       it 'calls two render callbacks' do
         expect(controller.called_callbacks).to eq(
-          [:before_render_new, :before_render_form])
+          %i[before_render_new before_render_form]
+        )
       end
     end
 
@@ -228,7 +231,8 @@ describe CrudTestModelsController do
 
     it 'calls the correct callbacks' do
       expect(controller.called_callbacks).to eq(
-        [:before_create, :before_save, :after_save, :after_create])
+        %i[before_create before_save after_save after_create]
+      )
     end
 
     context 'with before callback' do
@@ -254,7 +258,8 @@ describe CrudTestModelsController do
 
         it 'calls the correct callbacks' do
           expect(controller.called_callbacks).to eq(
-            [:before_render_new, :before_render_form])
+            %i[before_render_new before_render_form]
+          )
         end
       end
 
@@ -297,8 +302,9 @@ describe CrudTestModelsController do
 
           it 'calls the correct callbacks' do
             expect(controller.called_callbacks).to eq(
-              [:before_create, :before_save,
-               :before_render_new, :before_render_form])
+              %i[before_create before_save
+                 before_render_new before_render_form]
+            )
           end
         end
       end
@@ -321,7 +327,8 @@ describe CrudTestModelsController do
 
           it 'calls the correct callbacks' do
             expect(controller.called_callbacks).to eq(
-              [:before_create, :before_save])
+              %i[before_create before_save]
+            )
           end
         end
       end
@@ -331,7 +338,8 @@ describe CrudTestModelsController do
   describe_action :get, :edit, id: true do
     it 'calls the correct callbacks' do
       expect(controller.called_callbacks).to eq(
-        [:before_render_edit, :before_render_form])
+        %i[before_render_edit before_render_form]
+      )
     end
   end
 
@@ -340,11 +348,19 @@ describe CrudTestModelsController do
 
     it 'calls the correct callbacks' do
       expect(controller.called_callbacks).to eq(
-        [:before_update, :before_save, :after_save, :after_update])
+        %i[before_update before_save after_save after_update]
+      )
     end
 
     context 'with invalid params' do
-      let(:params) { { crud_test_model: { rating: 20 } } }
+      let(:params) do
+        {
+          crud_test_model: {
+            rating: 20,
+            other_ids: [OtherCrudTestModel.first.id]
+          }
+        }
+      end
 
       context '.html', combine: 'uhivp' do
         it_is_expected_to_respond
@@ -360,8 +376,13 @@ describe CrudTestModelsController do
 
         it 'calls the correct callbacks' do
           expect(controller.called_callbacks).to eq(
-            [:before_update, :before_save,
-             :before_render_edit, :before_render_form])
+            %i[before_update before_save
+               before_render_edit before_render_form]
+          )
+        end
+
+        it 'does not update has_many ids' do
+          expect(test_entry.reload.other_ids).to eq([])
         end
       end
 
@@ -372,7 +393,8 @@ describe CrudTestModelsController do
 
         it 'calls the correct callbacks' do
           expect(controller.called_callbacks).to eq(
-            [:before_update, :before_save])
+            %i[before_update before_save]
+          )
         end
       end
     end
@@ -381,7 +403,8 @@ describe CrudTestModelsController do
   describe_action :delete, :destroy, id: true do
     it 'calls the correct callbacks' do
       expect(controller.called_callbacks).to eq(
-        [:before_destroy, :after_destroy])
+        %i[before_destroy after_destroy]
+      )
     end
 
     context 'with failure' do
@@ -389,7 +412,7 @@ describe CrudTestModelsController do
       context '.html' do
         it 'does not delete entry from database',
            perform_request: false do
-          expect { perform_request }.not_to change { CrudTestModel.count }
+          expect { perform_request }.not_to(change { CrudTestModel.count })
         end
 
         it 'redirects to referer',
@@ -411,11 +434,13 @@ describe CrudTestModelsController do
 
       context 'callback', perform_request: false do
         before do
-          test_entry.update_attribute :name, 'illegal'
+          # rubocop:disable Rails/SkipsModelValidations
+          test_entry.update_attribute(:name, 'illegal')
+          # rubocop:enable Rails/SkipsModelValidations
         end
 
         it 'does not delete entry from database' do
-          expect { perform_request }.not_to change { CrudTestModel.count }
+          expect { perform_request }.not_to(change { CrudTestModel.count })
         end
 
         it 'redirects to index' do

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rails_helper'
 
 describe 'DryCrud::Form::Builder' do
@@ -41,9 +40,8 @@ describe 'DryCrud::Form::Builder' do
       last_seen: :datetime_field,
       companion_id: :belongs_to_field,
       other_ids: :has_many_field,
-      more_ids: :has_many_field
-    }.each do |attr, method|
-      it 'dispatches #{attr} attr to #{method}' do
+      more_ids: :has_many_field }.each do |attr, method|
+      it "dispatches #{attr} attr to #{method}" do
         expect(form).to receive(method).with(attr, {})
         form.input_field(attr)
       end
@@ -65,12 +63,12 @@ describe 'DryCrud::Form::Builder' do
   describe '#labeled_input_field' do
     context 'when required' do
       subject { form.labeled_input_field(:name) }
-      it { is_expected.to include('input-group-addon') }
+      it { is_expected.to include('input-group-append') }
     end
 
     context 'when not required' do
       subject { form.labeled_input_field(:remarks) }
-      it { is_expected.not_to include('input-group-addon') }
+      it { is_expected.not_to include('input-group-append') }
     end
 
     context 'with help text' do
@@ -227,8 +225,8 @@ describe 'DryCrud::Form::Builder' do
     end
   end
 
-  def expect_n_options(f, n)
-    expect(f.scan('</option>').size).to eq(n)
+  def expect_n_options(form, 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,4 +1,3 @@
-# encoding: UTF-8
 require 'rails_helper'
 
 describe 'DryCrud::Table::Builder' do
@@ -6,7 +5,7 @@ describe 'DryCrud::Table::Builder' do
   include FormatHelper
   include UtilityHelper
 
-  let(:entries) { %w(foo bahr) }
+  let(:entries) { %w[foo bahr] }
   let(:table)   { DryCrud::Table::Builder.new(entries, self) }
 
   def format_size(obj) #:nodoc:

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rails_helper'
 
 describe FormHelper do

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rails_helper'
 
 describe FormatHelper do
@@ -32,7 +31,8 @@ describe FormatHelper do
       it do
         expect(subject.squish).to match(
           /^<dt>label<\/dt>
-           \ <dd\ class=['"]value['"]>value<\/dd>$/x)
+           \ <dd\ class=['"]value['"]>value<\/dd>$/x
+        )
       end
     end
 
@@ -45,7 +45,8 @@ describe FormatHelper do
           /<dt>label<\/dt>
            \ <dd\ class=['"]value['"]>
            #{UtilityHelper::EMPTY_STRING}
-           <\/dd>$/x)
+           <\/dd>$/x
+        )
       end
     end
 
@@ -58,7 +59,8 @@ describe FormatHelper do
           /<dt>label<\/dt>
            \ <dd\ class=['"]value['"]>
            value\ &lt;unsafe&gt;
-           <\/dd>$/x)
+           <\/dd>$/x
+        )
       end
     end
   end
@@ -70,7 +72,8 @@ describe FormatHelper do
     it do
       expect(subject.squish).to match(
         /<dt>Size<\/dt>
-         \ <dd\ class=['"]value['"]>3\ chars<\/dd>$/x)
+         \ <dd\ class=['"]value['"]>3\ chars<\/dd>$/x
+      )
     end
   end
 
@@ -147,7 +150,8 @@ describe FormatHelper do
 
     it 'formats empty belongs_to' do
       expect(format_attr(crud_test_models(:AAAAA), :companion)).to eq(
-        t('global.associations.no_entry'))
+        t('global.associations.no_entry')
+      )
     end
 
     it 'formats existing belongs_to' do
@@ -155,6 +159,17 @@ describe FormatHelper do
       expect(string).to eq('AAAAA')
     end
 
+    it 'formats empty has_one' do
+      expect(format_attr(crud_test_models(:FFFFF), :comrad)).to eq(
+        t('global.associations.no_entry')
+      )
+    end
+
+    it 'formats existing has_one' do
+      string = format_attr(crud_test_models(:AAAAA), :comrad)
+      expect(string).to eq('BBBBB')
+    end
+
     it 'formats existing has_many' do
       string = format_attr(crud_test_models(:CCCCC), :others)
       expect(string).to be_html_safe
@@ -224,7 +239,8 @@ describe FormatHelper do
       string = format_type(model, :remarks)
       expect(string).to be_html_safe
       expect(string).to eq(
-        "<p>AAAAA BBBBB CCCCC\n<br />AAAAA BBBBB CCCCC\n</p>")
+        "<p>AAAAA BBBBB CCCCC\n<br />AAAAA BBBBB CCCCC\n</p>"
+      )
     end
 
     it 'escapes texts' do

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'rails_helper'
 
 describe I18nHelper do
@@ -12,7 +11,9 @@ describe I18nHelper do
       I18n.backend.store_translations(
         I18n.locale,
         global: {
-          test_key: 'global' })
+          test_key: 'global'
+        }
+      )
     end
     subject { ti(:test_key) }
 
@@ -24,7 +25,10 @@ describe I18nHelper do
           I18n.locale,
           list: {
             global: {
-              test_key: 'list global' } })
+              test_key: 'list global'
+            }
+          }
+        )
       end
       it { is_expected.to eq('list global') }
 
@@ -34,7 +38,10 @@ describe I18nHelper do
             I18n.locale,
             list: {
               index: {
-                test_key: 'list index' } })
+                test_key: 'list index'
+              }
+            }
+          )
         end
         it { is_expected.to eq('list index') }
 
@@ -44,7 +51,10 @@ describe I18nHelper do
               I18n.locale,
               crud: {
                 global: {
-                  test_key: 'crud global' } })
+                  test_key: 'crud global'
+                }
+              }
+            )
           end
           it { is_expected.to eq('crud global') }
 
@@ -54,7 +64,10 @@ describe I18nHelper do
                 I18n.locale,
                 crud: {
                   index: {
-                    test_key: 'crud index' } })
+                    test_key: 'crud index'
+                  }
+                }
+              )
             end
             it { is_expected.to eq('crud index') }
 
@@ -64,7 +77,10 @@ describe I18nHelper do
                   I18n.locale,
                   crud_test_models: {
                     global: {
-                      test_key: 'test global' } })
+                      test_key: 'test global'
+                    }
+                  }
+                )
               end
               it { is_expected.to eq('test global') }
 
@@ -74,7 +90,10 @@ describe I18nHelper do
                     I18n.locale,
                     crud_test_models: {
                       index: {
-                        test_key: 'test index' } })
+                        test_key: 'test index'
+                      }
+                    }
+                  )
                 end
                 it { is_expected.to eq('test index') }
               end
@@ -94,7 +113,10 @@ describe I18nHelper do
         I18n.locale,
         global: {
           associations: {
-            test_key: 'global' } })
+            test_key: 'global'
+          }
+        }
+      )
     end
     it { is_expected.to eq('global') }
 
@@ -105,7 +127,11 @@ describe I18nHelper do
           activerecord: {
             associations: {
               crud_test_model: {
-                test_key: 'model' } } })
+                test_key: 'model'
+              }
+            }
+          }
+        )
       end
 
       it { is_expected.to eq('model') }
@@ -119,7 +145,13 @@ describe I18nHelper do
                 models: {
                   crud_test_model: {
                     companion: {
-                      test_key: 'companion' } } } } })
+                      test_key: 'companion'
+                    }
+                  }
+                }
+              }
+            }
+          )
         end
 
         it { is_expected.to eq('companion') }