active_scaffold 3.4.17 → 3.4.18

data/test/config/create_test.rb

@@ -6,15 +6,21 @@ module Config
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.create.link
     end
-    
+
     def teardown
       @config.create.link = @default_link
     end
-    
+
     def test_default_options
       refute @config.create.persistent
       assert @config.create.action_after_create.nil?
       assert_equal 'Create Model stub', @config.create.label
+      assert @config.columns[:b].required?
+    end
+
+    def test_override_required
+      @config.configure { |conf| conf.columns[:b].required = false }
+      refute @config.columns[:b].required?
     end
 
     def test_link_defaults
@@ -22,8 +28,8 @@ module Config
       refute link.page?
       refute link.popup?
       refute link.confirm?
-      assert_equal "new", link.action
-      assert_equal "Create New", link.label
+      assert_equal 'new', link.action
+      assert_equal 'Create New', link.label
       assert link.inline?
       blank = {}
       assert_equal blank, link.html_options
@@ -32,12 +38,12 @@ module Config
       assert_equal :create, link.crud_type
       assert_equal :create_authorized?, link.security_method
     end
-    
+
     def test_setting_link
       @config.create.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
       refute_equal @default_link, @config.create.link
     end
-    
+
     def test_label
       label = 'create new monkeys'
       @config.create.label = label
@@ -46,12 +52,12 @@ module Config
       @config.create.label = :create_new_model
       assert_equal 'Create new Model stub', @config.create.label
     end
-    
+
     def test_persistent
       @config.create.persistent = true
       assert @config.create.persistent
     end
-   
+
     def test_action_after_create
       @config.create.action_after_create = :edit
       assert_equal :edit, @config.create.action_after_create

data/test/config/delete_test.rb

@@ -6,7 +6,7 @@ module Config
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.delete.link
     end
-    
+
     def teardown
       @config.delete.link = @default_link
     end
@@ -16,8 +16,8 @@ module Config
       refute link.page?
       refute link.popup?
       assert link.confirm?
-      assert_equal "destroy", link.action
-      assert_equal "Delete", link.label
+      assert_equal 'destroy', link.action
+      assert_equal 'Delete', link.label
       assert link.inline?
       blank = {}
       assert_equal blank, link.html_options
@@ -26,7 +26,7 @@ module Config
       assert_equal :delete, link.crud_type
       assert_equal :delete_authorized?, link.security_method
     end
-    
+
     def test_setting_link
       @config.delete.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
       refute_equal @default_link, @config.delete.link

data/test/config/field_search_test.rb

@@ -7,15 +7,15 @@ module Config
       @config.actions.swap :search, :field_search
       @default_link = @config.field_search.link
     end
-    
+
     def teardown
       @config.field_search.link = @default_link
     end
-    
+
     def test_default_options
       assert_equal :full, @config.field_search.text_search
     end
-    
+
     def test_text_search
       @config.field_search.text_search = :start
       assert_equal :start, @config.field_search.text_search
@@ -30,8 +30,8 @@ module Config
       refute link.page?
       refute link.popup?
       refute link.confirm?
-      assert_equal "show_search", link.action
-      assert_equal "Search", link.label
+      assert_equal 'show_search', link.action
+      assert_equal 'Search', link.label
       assert link.inline?
       blank = {}
       assert_equal blank, link.html_options
@@ -40,7 +40,7 @@ module Config
       assert_equal :read, link.crud_type
       assert_equal :search_authorized?, link.security_method
     end
-    
+
     def test_setting_link
       @config.field_search.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
       refute_equal @default_link, @config.field_search.link

data/test/config/list_test.rb

@@ -31,40 +31,40 @@ module Config
       assert @config.list.sorting.sorts_on?(:id)
       assert_equal 'ASC', @config.list.sorting.direction_of(:id)
     end
-    
+
     def test_empty_field_text
       @config.list.empty_field_text = '(missing)'
       assert_equal '(missing)', @config.list.empty_field_text
     end
-    
+
     def test_association_join_text
       @config.list.association_join_text = '<br/>'
       assert_equal '<br/>', @config.list.association_join_text
     end
-    
+
     def test_no_entries
       @config.list.no_entries_message = 'No items'
       assert_equal 'No items', @config.list.no_entries_message
     end
-    
+
     def test_filtered_message
       @config.list.filtered_message = 'filtered items'
       assert_equal 'filtered items', @config.list.filtered_message
     end
-    
+
     def test_pagination
       @config.list.pagination = :infinite
       assert_equal :infinite, @config.list.pagination
       @config.list.pagination = false
       refute @config.list.pagination
     end
-    
+
     def test_sorting
       @config.list.sorting = {:a => :desc}
       assert @config.list.sorting.sorts_on?(:a)
       assert_equal 'DESC', @config.list.sorting.direction_of(:a)
       refute @config.list.sorting.sorts_on?(:id)
-      
+
       @config.list.sorting = {:c => :asc, :d => :desc}
       assert @config.list.sorting.sorts_on?(:c)
       assert_equal 'ASC', @config.list.sorting.direction_of(:c)
@@ -72,7 +72,7 @@ module Config
       assert_equal 'DESC', @config.list.sorting.direction_of(:d)
       refute @config.list.sorting.sorts_on?(:a)
       refute @config.list.sorting.sorts_on?(:id)
-      
+
       @config.list.sorting = [{:a => :asc}, {:b => :desc}]
       assert @config.list.sorting.sorts_on?(:a)
       assert_equal 'ASC', @config.list.sorting.direction_of(:a)
@@ -81,51 +81,51 @@ module Config
       refute @config.list.sorting.sorts_on?(:c)
       refute @config.list.sorting.sorts_on?(:id)
     end
-    
+
     def test_per_page
       per_page = 35
       @config.list.per_page = per_page
       assert_equal per_page, @config.list.per_page
     end
-    
+
     def test_page_links_window
       page_links_window = 3
       @config.list.page_links_inner_window = page_links_window
       assert_equal page_links_window, @config.list.page_links_inner_window
     end
-    
+
     def test_always_show_create
       always_show_create = true
       @config.list.always_show_create = always_show_create
       assert_equal always_show_create, @config.list.always_show_create
     end
-    
+
     def test_always_show_create_when_create_is_not_enabled
       always_show_create = true
       @config.list.always_show_create = always_show_create
       @config.actions.exclude :create
       assert_equal false, @config.list.always_show_create
     end
-    
+
     def test_always_show_search
       @config.list.always_show_search = true
       assert @config.list.always_show_search
       assert_equal 'search', @config.list.search_partial
     end
-    
+
     def test_always_show_search_when_search_is_not_enabled
       @config.list.always_show_search = true
       @config.actions.exclude :search
       assert_equal false, @config.list.always_show_search
     end
-    
+
     def test_always_show_search_when_field_search
       @config.list.always_show_search = true
       @config.actions.swap :search, :field_search
       assert @config.list.always_show_search
       assert_equal 'field_search', @config.list.search_partial
     end
-    
+
     def test_count_includes
       @config.list.count_includes = [:assoc_1, :assoc_2]
       assert_equal [:assoc_1, :assoc_2], @config.list.count_includes

data/test/config/nested_test.rb

@@ -10,12 +10,12 @@ module Config
     def setup
       @config = ActiveScaffold::Config::Core.new(:model_stub)
     end
-    
+
     def test_default_options
       assert @config.nested.shallow_delete
       assert_equal 'Add Existing Model stub', @config.nested.label
     end
-    
+
     def test_label
       label = 'nested monkeys'
       @config.nested.label = label
@@ -24,12 +24,12 @@ module Config
       @config.nested.label = :test_create_model
       assert_equal 'Add new Model stub', @config.nested.label
     end
-    
+
     def test_shallow_delete
       @config.nested.shallow_delete = true
       assert @config.nested.shallow_delete
     end
-    
+
     def test_add_link
       assert_raises(ArgumentError) { @config.nested.add_link :assoc_1 }
       config = @config

data/test/config/search_test.rb

@@ -6,17 +6,17 @@ module Config
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.search.link
     end
-    
+
     def teardown
       @config.search.link = @default_link
     end
-    
+
     def test_default_options
       assert_equal :full, @config.search.text_search
       refute @config.search.live?
       assert_equal ' ', @config.search.split_terms
     end
-    
+
     def test_text_search
       @config.search.text_search = :start
       assert_equal :start, @config.search.text_search
@@ -25,12 +25,12 @@ module Config
       @config.search.text_search = false
       refute @config.search.text_search
     end
-    
+
     def test_live
       @config.search.live = true
       assert @config.search.live?
     end
-    
+
     def test_split_terms
       @config.search.split_terms = nil
       assert @config.search.split_terms.nil?
@@ -43,8 +43,8 @@ module Config
       refute link.page?
       refute link.popup?
       refute link.confirm?
-      assert_equal "show_search", link.action
-      assert_equal "Search", link.label
+      assert_equal 'show_search', link.action
+      assert_equal 'Search', link.label
       assert link.inline?
       blank = {}
       assert_equal blank, link.html_options
@@ -53,7 +53,7 @@ module Config
       assert_equal :read, link.crud_type
       assert_equal :search_authorized?, link.security_method
     end
-    
+
     def test_setting_link
       @config.search.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
       refute_equal @default_link, @config.search.link

data/test/config/show_test.rb

@@ -6,18 +6,18 @@ module Config
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.show.link
     end
-    
+
     def teardown
       @config.show.link = @default_link
     end
-    
+
     def test_link_defaults
       link = @config.show.link
       refute link.page?
       refute link.popup?
       refute link.confirm?
-      assert_equal "show", link.action
-      assert_equal "Show", link.label
+      assert_equal 'show', link.action
+      assert_equal 'Show', link.label
       assert link.inline?
       blank = {}
       assert_equal blank, link.html_options
@@ -26,12 +26,12 @@ module Config
       assert_equal :read, link.crud_type
       assert_equal :show_authorized?, link.security_method
     end
-    
+
     def test_setting_link
       @config.show.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
       refute_equal @default_link, @config.show.link
     end
-    
+
     def test_label
       label = 'show monkeys'
       @config.show.label = label

data/test/config/subform_test.rb

@@ -9,7 +9,7 @@ module Config
     def test_defaults
       assert_equal :horizontal, @config.subform.layout
     end
-    
+
     def test_setting_layout
       layout = :vertical
       @config.subform.layout = layout

data/test/config/update_test.rb

@@ -5,31 +5,31 @@ module Config
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end
-    
+
     def test__params_for_columns__returns_all_params
       @config._load_action_columns
       @config.columns[:a].params.add :keep_a, :a_temp
       assert @config.columns[:a].params.include?(:keep_a)
       assert @config.columns[:a].params.include?(:a_temp)
     end
-    
+
     def test_default_options
       refute @config.update.persistent
       refute @config.update.nested_links
       assert_equal 'Model stub', @config.update.label
     end
-    
+
     def test_persistent
       @config.update.persistent = true
       assert @config.update.persistent
     end
-    
+
     def test_nested_links
       old, @config.update.nested_links = @config.update.nested_links, true
       assert @config.update.nested_links
       @config.update.nested_links = old
     end
-    
+
     def test_label
       label = 'update new monkeys'
       @config.update.label = label

data/test/const_mocker.rb

@@ -5,15 +5,15 @@ class ConstMocker
     @const_state = nil
     @const_state = @parent.const_defined?(@const_name) ? @parent.const_get(@const_name) : nil
   end
-  
+
   def remove
     @parent.send :remove_const, @const_name if @parent.const_defined?(@const_name)
   end
-  
+
   def declare
     @parent.const_set @const_name, Class.new
   end
-  
+
   def restore
     remove
     @parent.const_set @const_name, @const_state if @const_state
@@ -22,7 +22,7 @@ class ConstMocker
   def const
     @parent.const_get @const_name if @parent.const_defined?(@const_name)
   end
-  
+
   def self.mock(const_name, parent = Object, &block)
     cm = new(const_name, parent)
     yield(cm)

data/test/data_structures/action_columns_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 # require 'test/model_stub'
-#require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
+# require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
 
 class ActionColumnsTest < MiniTest::Test
   def setup
@@ -61,7 +61,6 @@ class ActionColumnsTest < MiniTest::Test
     @columns.add [:f, :g]
     assert @columns.include?(:f)
     assert @columns.include?(:g)
-
   end
 
   def test_length
@@ -77,7 +76,7 @@ class ActionColumnsTest < MiniTest::Test
     # then use the shortcut
     @columns.add_subgroup 'foo' do
     end
-    assert @columns.any? { |c| c.respond_to? :label and c.label == 'foo' }
+    assert @columns.any? { |c| c.respond_to?(:label) && c.label == 'foo' }
   end
 
   def test_block_config
@@ -93,11 +92,11 @@ class ActionColumnsTest < MiniTest::Test
 
     assert @columns.include?(:c)
     refute @columns.include?(:b)
-    @columns.each { |c|
+    @columns.each do |c|
       next unless c.is_a? ActiveScaffold::DataStructures::Columns
       assert c.include?(:e)
       assert_equal 'my subgroup', c.name
-    }
+    end
   end
 
   def test_include