dry_crud 5.0.0 → 5.2.0

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/custom_assertions'
 require 'support/crud_test_helper'

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
 
@@ -27,7 +26,8 @@ module DryCrud
         assert_equal form.with_addon(
           form.string_field(:name,
                             required: 'required'),
-          '*'),
+          '*'
+        ),
                      form.input_field(:name)
         assert form.string_field(:name).html_safe?
       end
@@ -97,15 +97,15 @@ module DryCrud
 
       test 'labeld_input_field adds required mark' do
         result = form.labeled_input_field(:name)
-        assert result.include?('input-group-addon')
+        assert result.include?('input-group-append')
         result = form.labeled_input_field(:remarks)
-        assert !result.include?('input-group-addon')
+        assert_not result.include?('input-group-append')
       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')
+        assert result.include?('input-group-append')
       end
 
       test 'belongs_to_field has all options by default' do
@@ -242,7 +242,7 @@ module DryCrud
       end
 
       test 'respond to still works' do
-        assert !form.respond_to?(:blalba)
+        assert_not form.respond_to?(:blalba)
         assert form.respond_to?(:text_field)
         assert form.respond_to?(:labeled_text_field)
       end

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 
 module DryCrud
@@ -13,7 +12,7 @@ module DryCrud
       attr_reader :table, :entries
 
       def setup
-        @entries = %w(foo bahr)
+        @entries = %w[foo bahr]
         @table = DryCrud::Table::Builder.new(entries, self)
       end
 

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
 require 'support/crud_test_helper'
@@ -73,7 +72,7 @@ class FormHelperTest < ActionView::TestCase
   test 'standard form with errors' do
     e = crud_test_models('AAAAA')
     e.name = nil
-    assert !e.valid?
+    assert_not e.valid?
 
     f = with_test_routing do
       capture do

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
 
@@ -63,7 +62,7 @@ class FormatHelperTest < ActionView::TestCase
   test 'format Strings' do
     assert_equal 'blah blah', f('blah blah')
     assert_equal '<injection>', f('<injection>')
-    assert !f('<injection>').html_safe?
+    assert_not f('<injection>').html_safe?
   end
 
   unless ENV['NON_LOCALIZED'] # localization dependent tests
@@ -159,6 +158,17 @@ class FormatHelperTest < ActionView::TestCase
     assert_equal 'AAAAA', format_attr(m, :companion)
   end
 
+  test 'format has one without content' do
+    m = crud_test_models(:FFFFF)
+    assert_equal t('global.associations.no_entry'),
+                 format_attr(m, :comrad)
+  end
+
+  test 'format has one with content' do
+    m = crud_test_models(:AAAAA)
+    assert_equal 'BBBBB', format_attr(m, :comrad)
+  end
+
   test 'format has_many column with content' do
     m = crud_test_models(:CCCCC)
     assert_equal '<ul><li>AAAAA</li><li>BBBBB</li></ul>',
@@ -169,7 +179,7 @@ class FormatHelperTest < ActionView::TestCase
     assert_equal 'Camel Case', captionize(:camel_case)
     assert_equal 'All Upper Case', captionize('all upper case')
     assert_equal 'With Object', captionize('With object', Object.new)
-    assert !captionize('bad <title>').html_safe?
+    assert_not captionize('bad <title>').html_safe?
   end
 
 end

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
 require 'support/crud_test_models_controller'
@@ -14,37 +13,44 @@ class I18nHelperTest < ActionView::TestCase
 
     I18n.backend.store_translations(
       I18n.locale,
-      global: { test_key: 'global' })
+      global: { test_key: 'global' }
+    )
     assert_equal 'global', ti(:test_key)
 
     I18n.backend.store_translations(
       I18n.locale,
-      list: { global: { test_key: 'list global' } })
+      list: { global: { test_key: 'list global' } }
+    )
     assert_equal 'list global', ti(:test_key)
 
     I18n.backend.store_translations(
       I18n.locale,
-      list: { index: { test_key: 'list index' } })
+      list: { index: { test_key: 'list index' } }
+    )
     assert_equal 'list index', ti(:test_key)
 
     I18n.backend.store_translations(
       I18n.locale,
-      crud: { global: { test_key: 'crud global' } })
+      crud: { global: { test_key: 'crud global' } }
+    )
     assert_equal 'crud global', ti(:test_key)
 
     I18n.backend.store_translations(
       I18n.locale,
-      crud: { index: { test_key: 'crud index' } })
+      crud: { index: { test_key: 'crud index' } }
+    )
     assert_equal 'crud index', ti(:test_key)
 
     I18n.backend.store_translations(
       I18n.locale,
-      crud_test_models: { global: { test_key: 'test global' } })
+      crud_test_models: { global: { test_key: 'test global' } }
+    )
     assert_equal 'test global', ti(:test_key)
 
     I18n.backend.store_translations(
       I18n.locale,
-      crud_test_models: { index: { test_key: 'test index' } })
+      crud_test_models: { index: { test_key: 'test index' } }
+    )
     assert_equal 'test index', ti(:test_key)
   end
 
@@ -53,7 +59,8 @@ class I18nHelperTest < ActionView::TestCase
 
     I18n.backend.store_translations(
       I18n.locale,
-      global: { associations: { test_key: 'global' } })
+      global: { associations: { test_key: 'global' } }
+    )
     assert_equal 'global', ta(:test_key, assoc)
 
     I18n.backend.store_translations(
@@ -61,7 +68,11 @@ class I18nHelperTest < ActionView::TestCase
       activerecord: {
         associations: {
           crud_test_model: {
-            test_key: 'model' } } })
+            test_key: 'model'
+          }
+        }
+      }
+    )
     assert_equal 'model', ta(:test_key, assoc)
 
     I18n.backend.store_translations(
@@ -71,7 +82,13 @@ class I18nHelperTest < ActionView::TestCase
           models: {
             crud_test_model: {
               companion: {
-                test_key: 'companion' } } } } })
+                test_key: 'companion'
+              }
+            }
+          }
+        }
+      }
+    )
     assert_equal 'companion', ta(:test_key, assoc)
 
     assert_equal 'global', ta(:test_key)

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/custom_assertions'
 require 'support/crud_test_model'
@@ -38,7 +37,7 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'non empty table renders table' do
-    result = plain_table_or_message(%w(foo bar)) do |t|
+    result = plain_table_or_message(%w[foo bar]) do |t|
       t.attrs :size, :upcase
     end
     assert result.html_safe?
@@ -47,11 +46,12 @@ class TableHelperTest < ActionView::TestCase
 
   test 'table with attrs' do
     expected = DryCrud::Table::Builder.table(
-      %w(foo bar), self,
-      class: 'table table-striped table-hover') do |t|
+      %w[foo bar], self,
+      class: 'table table-striped table-hover'
+    ) do |t|
       t.attrs :size, :upcase
     end
-    actual = plain_table(%w(foo bar), :size, :upcase)
+    actual = plain_table(%w[foo bar], :size, :upcase)
     assert actual.html_safe?
     assert_equal expected, actual
   end

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
 
@@ -7,18 +6,21 @@ class UtilityHelperTest < ActionView::TestCase
 
   include CrudTestHelper
 
+  setup :reset_db, :setup_db, :create_test_data
+  teardown :reset_db
+
   test 'content_tag_nested escapes safe correctly' do
-    html = content_tag_nested(:div, %w(a b)) { |e| content_tag(:span, e) }
+    html = content_tag_nested(:div, %w[a b]) { |e| content_tag(:span, e) }
     assert_equal '<div><span>a</span><span>b</span></div>', html
   end
 
   test 'content_tag_nested escapes unsafe correctly' do
-    html = content_tag_nested(:div, %w(a b)) { |e| "<#{e}>" }
+    html = content_tag_nested(:div, %w[a b]) { |e| "<#{e}>" }
     assert_equal '<div>&lt;a&gt;&lt;b&gt;</div>', html
   end
 
   test 'content_tag_nested without block' do
-    html = content_tag_nested(:div, %w(a b))
+    html = content_tag_nested(:div, %w[a b])
     assert_equal '<div>ab</div>', html
   end
 
@@ -28,30 +30,23 @@ class UtilityHelperTest < ActionView::TestCase
   end
 
   test 'safe_join with block' do
-    html = safe_join(%w(a b)) { |e| content_tag(:span, e) }
+    html = safe_join(%w[a b]) { |e| content_tag(:span, e) }
     assert_equal '<span>a</span><span>b</span>', html
   end
 
   test 'default attributes do not include id and password' do
-    reset_db
-    setup_db
-    assert_equal [:name, :email, :whatever, :children, :companion_id, :rating,
-                  :income, :birthdate, :gets_up_at, :last_seen, :human,
-                  :remarks, :created_at, :updated_at],
+    assert_equal %i[name email whatever children companion_id rating
+                    income birthdate gets_up_at last_seen human
+                    remarks created_at updated_at],
                  default_crud_attrs
-    reset_db
   end
 
   test 'column types' do
-    reset_db
-    setup_db
-    create_test_data
-
     m = crud_test_models(:AAAAA)
     assert_equal :string, column_type(m, :name)
     assert_equal :integer, column_type(m, :children)
     assert_equal :integer, column_type(m, :companion_id)
-    assert_equal nil, column_type(m, :companion)
+    assert_nil column_type(m, :companion)
     assert_equal :float, column_type(m, :rating)
     assert_equal :decimal, column_type(m, :income)
     assert_equal :date, column_type(m, :birthdate)
@@ -59,8 +54,6 @@ class UtilityHelperTest < ActionView::TestCase
     assert_equal :datetime, column_type(m, :last_seen)
     assert_equal :boolean, column_type(m, :human)
     assert_equal :text, column_type(m, :remarks)
-
-    reset_db
   end
 
 end

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

@@ -1,10 +1,8 @@
-# encoding: UTF-8
-
 # A module to include into your functional tests for your crud controller
 # subclasses. Simply implement the two methods #test_entry and
 # #test_entry_attrs to test the basic crud functionality. Override the test
 # methods if you changed the behaviour in your subclass controller.
-module CrudControllerTestHelper
+module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
 
   def test_index # :nodoc:
     get :index, params: test_params
@@ -19,7 +17,7 @@ module CrudControllerTestHelper
     assert @response.body.starts_with?('[{'), @response.body
   end
 
-  def test_index_search # :nodoc:
+  def test_index_search # rubocop:disable Metrics/AbcSize :nodoc:
     field = @controller.search_columns.first
     val = field && test_entry[field].to_s
     return if val.blank? # does not support search or no value in this field
@@ -78,7 +76,7 @@ module CrudControllerTestHelper
       post :create, params: test_params(model_identifier => new_entry_attrs)
     end
     assert_redirected_to_show entry
-    assert !entry.new_record?
+    assert_not entry.new_record?
     assert_attrs_equal(new_entry_attrs)
   end
 
@@ -177,12 +175,12 @@ module CrudControllerTestHelper
 
   # Test object used in several tests.
   def test_entry
-    raise 'Implement this method in your test class'
+    raise 'Implement the method "test_entry" in your test class'
   end
 
   # Attribute hash used in several tests.
   def test_entry_attrs
-    raise 'Implement this method in your test class'
+    raise 'Implement the method "test_entry_attrs" in your test class'
   end
 
   # Attribute hash used in edit/update tests.

data/lib/generators/dry_crud/templates/test/support/crud_test_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 #:nodoc:
 REGEXP_ROWS = /<tr.+?<\/tr>/m #:nodoc:
 REGEXP_HEADERS = /<th.+?<\/th>/m #:nodoc:
@@ -57,8 +55,8 @@ module CrudTestHelper
     end
   end
 
-  def create_crud_test_models(c)
-    c.create_table :crud_test_models, force: true do |t|
+  def create_crud_test_models(connection)
+    connection.create_table :crud_test_models, force: true do |t|
       t.string   :name, null: false, limit: 50
       t.string   :email
       t.string   :password
@@ -77,16 +75,16 @@ module CrudTestHelper
     end
   end
 
-  def create_other_crud_test_models(c)
-    c.create_table :other_crud_test_models, force: true do |t|
+  def create_other_crud_test_models(connection)
+    connection.create_table :other_crud_test_models, force: true do |t|
       t.string  :name, null: false, limit: 50
       t.integer :more_id
     end
   end
 
-  def create_crud_test_models_other_crud_test_models(c)
-    c.create_table :crud_test_models_other_crud_test_models,
-                   force: true do |t|
+  def create_crud_test_models_other_crud_test_models(connection)
+    connection.create_table :crud_test_models_other_crud_test_models,
+                            force: true do |t|
       t.belongs_to :crud_test_model, index: { name: 'parent' }
       t.belongs_to :other_crud_test_model, index: { name: 'other' }
     end
@@ -95,9 +93,9 @@ module CrudTestHelper
   # Removes the crud_test_models table from the database.
   def reset_db
     c = ActiveRecord::Base.connection
-    [:crud_test_models,
-     :other_crud_test_models,
-     :crud_test_models_other_crud_test_models].each do |table|
+    %i[crud_test_models
+       other_crud_test_models
+       crud_test_models_other_crud_test_models].each do |table|
       c.drop_table(table) if c.data_source_exists?(table)
     end
   end
@@ -110,10 +108,11 @@ module CrudTestHelper
 
   # Fixture-style accessor method to get CrudTestModel instances by name
   def crud_test_models(name)
-    CrudTestModel.find_by_name(name.to_s)
+    CrudTestModel.find_by(name: name.to_s)
   end
 
   def with_test_routing
+    @routes ||= nil
     with_routing do |set|
       set.draw { resources :crud_test_models }
       # used to define a controller in these tests
@@ -136,7 +135,7 @@ module CrudTestHelper
     @routes.draw { resources :crud_test_models }
   end
 
-  def create(index, companion)
+  def create(index, companion) # rubocop:disable Metrics/AbcSize
     c = str(index)
     m = CrudTestModel.new(
       name: c,
@@ -150,7 +149,8 @@ module CrudTestHelper
                  "1#{index}:2#{index}",
       human: index.even?,
       remarks: "#{c} #{str(index + 1)} #{str(index + 2)}\n" *
-                  (index % 3 + 1))
+                  (index % 3 + 1)
+    )
     m.companion = companion
     m.save!
     m
@@ -172,7 +172,8 @@ module CrudTestHelper
   def without_transaction
     c = ActiveRecord::Base.connection
     start_transaction = false
-    if c.adapter_name.downcase.include?('mysql') && c.open_transactions > 0
+    if c.adapter_name.downcase.include?('mysql') &&
+       c.open_transactions.positive?
       # in transactional tests, we may simply rollback
       c.execute('ROLLBACK')
       start_transaction = true