dry_crud 3.0.0 → 5.0.0

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

@@ -8,7 +8,6 @@ require 'support/crud_test_model'
 class CustomAssertionsTest < ActiveSupport::TestCase
 
   include CustomAssertions
-
   include CrudTestHelper
 
   setup :reset_db, :setup_db, :create_test_data

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

@@ -6,7 +6,6 @@ module DryCrud
   module Form
     # Test DryCrud::Form::Builder
     class BuilderTest < ActionView::TestCase
-
       include FormatHelper
       include I18nHelper
       include CrudTestHelper
@@ -26,9 +25,9 @@ module DryCrud
 
       test 'input_field dispatches string attr to string_field' do
         assert_equal form.with_addon(
-                       form.string_field(:name,
-                                         required: 'required'),
-                       '*'),
+          form.string_field(:name,
+                            required: 'required'),
+          '*'),
                      form.input_field(:name)
         assert form.string_field(:name).html_safe?
       end

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

@@ -5,7 +5,6 @@ module DryCrud
   module Table
     # Test DryCrud::Table::Builder
     class BuilderTest < ActionView::TestCase
-
       # set dummy helper class for ActionView::TestCase
       self.helper_class = UtilityHelper
 
@@ -140,7 +139,6 @@ module DryCrud
 
         assert_dom_equal dom, table.to_html
       end
-
     end
   end
 end

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

@@ -117,7 +117,7 @@ class FormHelperTest < ActionView::TestCase
                         .*?name="crud_test_model\[birthdate\]"/x, f)
     assert_match(/input .*?type="time"
                         .*?name="crud_test_model\[gets_up_at\]"/x, f)
-    assert_match(/input .*?type="datetime"
+    assert_match(/input .*?type="datetime-local"
                         .*?name="crud_test_model\[last_seen\]"/x, f)
     assert_match(/input .*?type="checkbox"
                         .*?name="crud_test_model\[human\]"/x, f)
@@ -130,4 +130,5 @@ class FormHelperTest < ActionView::TestCase
   def entry
     @entry ||= CrudTestModel.first
   end
+
 end

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

@@ -104,7 +104,7 @@ class FormatHelperTest < ActionView::TestCase
       m = crud_test_models(:AAAAA)
       assert_equal '1.100', format_type(m, :rating)
 
-      m.rating = 3.145001   # you never know with these floats..
+      m.rating = 3.145001 # you never know with these floats..
       assert_equal '3.145', format_type(m, :rating)
     end
 

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

@@ -12,6 +12,8 @@ class TableHelperTest < ActionView::TestCase
   include CustomAssertions
   include CrudTestHelper
 
+  attr_accessor :params
+
   setup :reset_db, :setup_db, :create_test_data, :empty_params
   teardown :reset_db
 
@@ -26,9 +28,7 @@ class TableHelperTest < ActionView::TestCase
   end
 
   def empty_params
-    def params
-      {}
-    end
+    @params = {}
   end
 
   test 'empty table renders message' do
@@ -47,8 +47,8 @@ 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)
@@ -110,10 +110,7 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'standard list table with ascending sort params' do
-    def params
-      { sort: 'children', sort_dir: 'asc' }
-    end
-
+    @params = { sort: 'children', sort_dir: 'asc' }
     @entries = CrudTestModel.all
 
     table = with_test_routing do
@@ -127,10 +124,7 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'standard list table with descending sort params' do
-    def params
-      { sort: 'children', sort_dir: 'desc' }
-    end
-
+    @params = { sort: 'children', sort_dir: 'desc' }
     @entries = CrudTestModel.all
 
     table = with_test_routing do
@@ -144,10 +138,7 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'list table with custom column sort params' do
-    def params
-      { sort: 'chatty', sort_dir: 'asc' }
-    end
-
+    @params = { sort: 'chatty', sort_dir: 'asc' }
     @entries = CrudTestModel.all
 
     table = with_test_routing do

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

@@ -33,10 +33,13 @@ class UtilityHelperTest < ActionView::TestCase
   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],
                  default_crud_attrs
+    reset_db
   end
 
   test 'column types' do

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

@@ -7,14 +7,13 @@
 module CrudControllerTestHelper
 
   def test_index # :nodoc:
-    get :index, test_params
+    get :index, params: test_params
     assert_response :success
-    assert_template 'index'
     assert entries.present?
   end
 
   def test_index_json # :nodoc:
-    get :index, test_params(format: 'json')
+    get :index, params: test_params(format: 'json')
     assert_response :success
     assert entries.present?
     assert @response.body.starts_with?('[{'), @response.body
@@ -23,9 +22,9 @@ module CrudControllerTestHelper
   def test_index_search # :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
+    return if val.blank? # does not support search or no value in this field
 
-    get :index, test_params(q: val[0..((val.size + 1) / 2)])
+    get :index, params: test_params(q: val[0..((val.size + 1) / 2)])
     assert_response :success
     assert entries.present?
     assert entries.include?(test_entry)
@@ -33,31 +32,30 @@ module CrudControllerTestHelper
 
   def test_index_sort_asc # :nodoc:
     col = model_class.column_names.first
-    get :index, test_params(sort: col, sort_dir: 'asc')
+    get :index, params: test_params(sort: col, sort_dir: 'asc')
     assert_response :success
     assert entries.present?
-    sorted = entries.sort_by(&(col.to_sym))
+    sorted = entries.sort_by(&col.to_sym)
     assert_equal sorted, entries.to_a
   end
 
   def test_index_sort_desc # :nodoc:
     col = model_class.column_names.first
-    get :index, test_params(sort: col, sort_dir: 'desc')
+    get :index, params: test_params(sort: col, sort_dir: 'desc')
     assert_response :success
     assert entries.present?
-    sorted = entries.to_a.sort_by(&(col.to_sym))
+    sorted = entries.to_a.sort_by(&col.to_sym)
     assert_equal sorted.reverse, entries.to_a
   end
 
   def test_show # :nodoc:
-    get :show, test_params(id: test_entry.id)
+    get :show, params: test_params(id: test_entry.id)
     assert_response :success
-    assert_template 'show'
     assert_equal test_entry, entry
   end
 
   def test_show_json # :nodoc:
-    get :show, test_params(id: test_entry.id, format: 'json')
+    get :show, params: test_params(id: test_entry.id, format: 'json')
     assert_response :success
     assert_equal test_entry, entry
     assert @response.body.starts_with?('{')
@@ -65,20 +63,19 @@ module CrudControllerTestHelper
 
   def test_show_with_non_existing_id_raises_record_not_found # :nodoc:
     assert_raise(ActiveRecord::RecordNotFound) do
-      get :show, test_params(id: 9999)
+      get :show, params: test_params(id: 9999)
     end
   end
 
   def test_new # :nodoc:
-    get :new, test_params
+    get :new, params: test_params
     assert_response :success
-    assert_template 'new'
     assert entry.new_record?
   end
 
   def test_create # :nodoc:
     assert_difference("#{model_class.name}.count") do
-      post :create, test_params(model_identifier => new_entry_attrs)
+      post :create, params: test_params(model_identifier => new_entry_attrs)
     end
     assert_redirected_to_show entry
     assert !entry.new_record?
@@ -87,24 +84,23 @@ module CrudControllerTestHelper
 
   def test_create_json # :nodoc:
     assert_difference("#{model_class.name}.count") do
-      post :create, test_params(model_identifier => new_entry_attrs,
-                                format: 'json')
+      post :create, params: test_params(model_identifier => new_entry_attrs,
+                                        format: 'json')
     end
     assert_response :success
     assert @response.body.starts_with?('{"id":')
   end
 
   def test_edit # :nodoc:
-    get :edit, test_params(id: test_entry.id)
+    get :edit, params: test_params(id: test_entry.id)
     assert_response :success
-    assert_template 'edit'
     assert_equal test_entry, entry
   end
 
   def test_update # :nodoc:
     assert_no_difference("#{model_class.name}.count") do
-      put :update, test_params(id: test_entry.id,
-                               model_identifier => edit_entry_attrs)
+      put :update, params: test_params(id: test_entry.id,
+                                       model_identifier => edit_entry_attrs)
     end
     assert_attrs_equal(edit_entry_attrs)
     assert_redirected_to_show entry
@@ -112,9 +108,9 @@ module CrudControllerTestHelper
 
   def test_update_json # :nodoc:
     assert_no_difference("#{model_class.name}.count") do
-      put :update, test_params(id: test_entry.id,
-                               model_identifier => edit_entry_attrs,
-                               format: 'json')
+      put :update, params: test_params(id: test_entry.id,
+                                       model_identifier => edit_entry_attrs,
+                                       format: 'json')
     end
     assert_response :success
     assert @response.body.starts_with?('{"id":')
@@ -122,15 +118,15 @@ module CrudControllerTestHelper
 
   def test_destroy # :nodoc:
     assert_difference("#{model_class.name}.count", -1) do
-      delete :destroy, test_params(id: test_entry.id)
+      delete :destroy, params: test_params(id: test_entry.id)
     end
     assert_redirected_to_index
   end
 
   def test_destroy_json # :nodoc:
     assert_difference("#{model_class.name}.count", -1) do
-      delete :destroy, test_params(id: test_entry.id,
-                                   format: 'json')
+      delete :destroy, params: test_params(id: test_entry.id,
+                                           format: 'json')
     end
     assert_response :success
     assert_equal '', @response.body.strip
@@ -140,6 +136,7 @@ module CrudControllerTestHelper
 
   def assert_redirected_to_index # :nodoc:
     assert_redirected_to test_params(action: 'index',
+                                     id: nil,
                                      returning: true)
   end
 
@@ -180,12 +177,12 @@ module CrudControllerTestHelper
 
   # Test object used in several tests.
   def test_entry
-    fail 'Implement this method in your test class'
+    raise 'Implement this method in your test class'
   end
 
   # Attribute hash used in several tests.
   def test_entry_attrs
-    fail 'Implement this method in your test class'
+    raise 'Implement this method 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,10 +1,10 @@
 # encoding: utf-8
 
 #:nodoc:
-REGEXP_ROWS = /<tr.+?<\/tr>/m  #:nodoc:
-REGEXP_HEADERS = /<th.+?<\/th>/m  #:nodoc:
-REGEXP_SORT_HEADERS = /<th.*?><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m  #:nodoc:
-REGEXP_ACTION_CELL = /<td class=\"action\"><a .*?href.+?<\/a><\/td>/m  #:nodoc:
+REGEXP_ROWS = /<tr.+?<\/tr>/m #:nodoc:
+REGEXP_HEADERS = /<th.+?<\/th>/m #:nodoc:
+REGEXP_SORT_HEADERS = /<th.*?><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m #:nodoc:
+REGEXP_ACTION_CELL = /<td class=\"action\"><a .*?href.+?<\/a><\/td>/m #:nodoc:
 
 # A simple test helper to prepare the test database with a CrudTestModel model.
 # This helper is used to test the CrudController and various helpers
@@ -47,13 +47,11 @@ module CrudTestHelper
   # Look at the source to view the column definition.
   def setup_db
     without_transaction do
-      silence_stream(STDOUT) do
-        c = ActiveRecord::Base.connection
+      c = ActiveRecord::Base.connection
 
-        create_crud_test_models(c)
-        create_other_crud_test_models(c)
-        create_crud_test_models_other_crud_test_models(c)
-      end
+      create_crud_test_models(c)
+      create_other_crud_test_models(c)
+      create_crud_test_models_other_crud_test_models(c)
 
       CrudTestModel.reset_column_information
     end
@@ -89,8 +87,8 @@ module CrudTestHelper
   def create_crud_test_models_other_crud_test_models(c)
     c.create_table :crud_test_models_other_crud_test_models,
                    force: true do |t|
-      t.belongs_to :crud_test_model
-      t.belongs_to :other_crud_test_model
+      t.belongs_to :crud_test_model, index: { name: 'parent' }
+      t.belongs_to :other_crud_test_model, index: { name: 'other' }
     end
   end
 
@@ -100,7 +98,7 @@ module CrudTestHelper
     [:crud_test_models,
      :other_crud_test_models,
      :crud_test_models_other_crud_test_models].each do |table|
-      c.drop_table(table) if c.table_exists?(table)
+      c.drop_table(table) if c.data_source_exists?(table)
     end
   end
 

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

@@ -3,7 +3,7 @@
 # A dummy model used for general testing.
 class CrudTestModel < ActiveRecord::Base #:nodoc:
 
-  belongs_to :companion, class_name: 'CrudTestModel'
+  belongs_to :companion, class_name: 'CrudTestModel', optional: true
   has_and_belongs_to_many :others, class_name: 'OtherCrudTestModel'
   has_many :mores, class_name: 'OtherCrudTestModel',
                    foreign_key: :more_id
@@ -26,7 +26,7 @@ class CrudTestModel < ActiveRecord::Base #:nodoc:
   def protect_if_companion
     if companion.present?
       errors.add(:base, 'Cannot destroy model with companion')
-      false
+      throw :abort
     end
   end
 
@@ -36,9 +36,13 @@ end
 class OtherCrudTestModel < ActiveRecord::Base #:nodoc:
 
   has_and_belongs_to_many :others, class_name: 'CrudTestModel'
-  belongs_to :more, foreign_key: :more_id, class_name: 'CrudTestModel'
+  belongs_to :more,
+             foreign_key: :more_id,
+             class_name: 'CrudTestModel',
+             optional: true
 
   def to_s
     name
   end
+
 end

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

@@ -2,7 +2,8 @@
 
 # Controller for the dummy model.
 class CrudTestModelsController < CrudController #:nodoc:
-  HANDLE_PREFIX = 'handle_'
+
+  HANDLE_PREFIX = 'handle_'.freeze
 
   self.search_columns = [:name, :whatever, :remarks]
   self.sort_mappings = { chatty: 'length(remarks)' }
@@ -21,19 +22,17 @@ class CrudTestModelsController < CrudController #:nodoc:
   attr_reader :called_callbacks
   attr_accessor :should_redirect
 
-  hide_action :called_callbacks, :should_redirect, :should_redirect=
-
   # don't use the standard layout as it may require different routes
   # than just the test route for this controller
   layout false
 
   def index
     entries
-    render text: 'index js' if request.format.js?
+    render plain: 'index js' if request.format.js?
   end
 
   def show
-    render text: 'custom html' if entry.name == 'BBBBB'
+    render html: 'custom html' if entry.name == 'BBBBB'
   end
 
   def create
@@ -54,8 +53,6 @@ class CrudTestModelsController < CrudController #:nodoc:
     entries
   end
 
-  private
-
   def build_entry
     entry = super
     if params[model_identifier]
@@ -68,14 +65,13 @@ class CrudTestModelsController < CrudController #:nodoc:
   def handle_name
     if entry.name == 'illegal'
       flash[:alert] = 'illegal name'
-      false
+      throw :abort
     end
   end
 
   # callback to redirect if @should_redirect is set
   def possibly_redirect
     redirect_to action: 'index' if should_redirect && !performed?
-    !should_redirect
   end
 
   def set_companions