active_scaffold 3.3.2 → 3.3.3

data/test/config/nested_test.rb

@@ -1,62 +1,54 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::NestedTest < Test::Unit::TestCase
-  def setup
-    @config = ActiveScaffold::Config::Core.new :model_stub
-  end
-  
-  def test_default_options
-    assert !@config.nested.shallow_delete
-    assert_equal 'Add Existing ModelStub', @config.nested.label
-  end
-  
-  def test_label
-    label = 'nested monkeys'
-    @config.nested.label = label
-    assert_equal label, @config.nested.label
-    I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Add new %{model}'}
-    @config.nested.label = :create_model
-    assert_equal 'Add new ModelStub', @config.nested.label
-  end
-  
-  def test_shallow_delete
-    @config.nested.shallow_delete = true
-    assert @config.nested.shallow_delete
-  end
-  
-  def test_add_link_deprecation
-    ActiveSupport::Deprecation.silence { @config.nested.add_link :custom_link, [:assoc_1, :assoc_2] }
-    link = @config.action_links['nested']
-    assert_equal 'Custom Link', link.label
-    assert_equal 'nested', link.action
-    assert_equal :after, link.position
-    assert !link.page?
-    assert !link.popup?
-    assert !link.confirm?
-    assert link.inline?
-    assert_equal :assoc_1, link.parameters[:associations]
-    assert_equal 'assoc_1', link.html_options[:class]
-    assert_equal :get, link.method
-    assert_equal :member, link.type
-    assert_equal :read, link.crud_type
-    assert_equal :nested_authorized?, link.security_method
-  end
+module Config
+  class NestedTest < Test::Unit::TestCase
+    class ModelStubsController < ActionController::Base
+      active_scaffold
+    end
 
-  def test_add_link
-    @config.nested.add_link :custom_link, :assoc_1
-    link = @config.action_links['nested']
-    assert_equal 'Custom Link', link.label
-    assert_equal 'nested', link.action
-    assert_equal :after, link.position
-    assert !link.page?
-    assert !link.popup?
-    assert !link.confirm?
-    assert link.inline?
-    assert_equal :assoc_1, link.parameters[:associations]
-    assert_equal 'assoc_1', link.html_options[:class]
-    assert_equal :get, link.method
-    assert_equal :member, link.type
-    assert_equal :read, link.crud_type
-    assert_equal :nested_authorized?, link.security_method
+    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
+      assert_equal label, @config.nested.label
+      I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Add new %{model}'}
+      @config.nested.label = :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_raise(ArgumentError) { @config.nested.add_link :assoc_1 }
+      config = @config
+      ModelStubsController.class_eval do
+        config.configure { nested.add_link :other_models }
+      end
+      link = @config.action_links['index']
+      assert_equal 'ModelStubs', link.label
+      assert_equal 'index', link.action
+      assert_equal :after, link.position
+      assert !link.page?
+      assert !link.popup?
+      assert !link.confirm?
+      assert link.inline?
+      assert link.refresh_on_close
+      assert_equal :other_models, link.parameters[:association]
+      assert_equal :get, link.method
+      assert_equal :member, link.type
+      assert_equal :read, link.crud_type
+      assert_equal :nested_authorized?, link.security_method
+    end
   end
 end

data/test/config/search_test.rb

@@ -1,60 +1,62 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::SearchTest < Test::Unit::TestCase
-  def setup
-    @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
-    assert !@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
-    @config.search.text_search = :end
-    assert_equal :end, @config.search.text_search
-    @config.search.text_search = false
-    assert !@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?
-    @config.search.split_terms = ','
-    assert_equal ',', @config.search.split_terms
-  end
+module Config
+  class SearchTest < Test::Unit::TestCase
+    def setup
+      @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
+      assert !@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
+      @config.search.text_search = :end
+      assert_equal :end, @config.search.text_search
+      @config.search.text_search = false
+      assert !@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?
+      @config.search.split_terms = ','
+      assert_equal ',', @config.search.split_terms
+    end
 
-  def test_link_defaults
-    link = @config.search.link
-    assert !link.page?
-    assert !link.popup?
-    assert !link.confirm?
-    assert_equal "show_search", link.action
-    assert_equal "Search", link.label
-    assert link.inline?
-    blank = {}
-    assert_equal blank, link.html_options
-    assert_equal :get, link.method
-    assert_equal :collection, link.type
-    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')
-    assert_not_equal(@default_link, @config.search.link)
+    def test_link_defaults
+      link = @config.search.link
+      assert !link.page?
+      assert !link.popup?
+      assert !link.confirm?
+      assert_equal "show_search", link.action
+      assert_equal "Search", link.label
+      assert link.inline?
+      blank = {}
+      assert_equal blank, link.html_options
+      assert_equal :get, link.method
+      assert_equal :collection, link.type
+      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')
+      assert_not_equal(@default_link, @config.search.link)
+    end
   end
 end

data/test/config/show_test.rb

@@ -1,43 +1,45 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::ShowTest < Test::Unit::TestCase
-  def setup
-    @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
-    assert !link.page?
-    assert !link.popup?
-    assert !link.confirm?
-    assert_equal "show", link.action
-    assert_equal "Show", link.label
-    assert link.inline?
-    blank = {}
-    assert_equal blank, link.html_options
-    assert_equal :get, link.method
-    assert_equal :member, link.type
-    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')
-    assert_not_equal(@default_link, @config.show.link)
-  end
-  
-  def test_label
-    label = 'show monkeys'
-    @config.show.label = label
-    assert_equal label, @config.show.label
-    I18n.backend.store_translations :en, :active_scaffold => {:view_model => 'View %{model}'}
-    @config.show.label = :view_model
-    assert_equal 'View ModelStub', @config.show.label
-    assert_equal 'View record', @config.show.label('record')
+module Config
+  class ShowTest < Test::Unit::TestCase
+    def setup
+      @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
+      assert !link.page?
+      assert !link.popup?
+      assert !link.confirm?
+      assert_equal "show", link.action
+      assert_equal "Show", link.label
+      assert link.inline?
+      blank = {}
+      assert_equal blank, link.html_options
+      assert_equal :get, link.method
+      assert_equal :member, link.type
+      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')
+      assert_not_equal(@default_link, @config.show.link)
+    end
+    
+    def test_label
+      label = 'show monkeys'
+      @config.show.label = label
+      assert_equal label, @config.show.label
+      I18n.backend.store_translations :en, :active_scaffold => {:view_model => 'View %{model}'}
+      @config.show.label = :view_model
+      assert_equal 'View Model stub', @config.show.label
+      assert_equal 'View record', @config.show.label('record')
+    end
   end
 end

data/test/config/subform_test.rb

@@ -1,17 +1,19 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::SubformTest < Test::Unit::TestCase
-  def setup
-    @config = ActiveScaffold::Config::Core.new :model_stub
-  end
+module Config
+  class SubformTest < Test::Unit::TestCase
+    def setup
+      @config = ActiveScaffold::Config::Core.new :model_stub
+    end
 
-  def test_defaults
-    assert_equal :horizontal, @config.subform.layout
-  end
-  
-  def test_setting_layout
-    layout = :vertical
-    @config.subform.layout = layout
-    assert_equal layout, @config.subform.layout
+    def test_defaults
+      assert_equal :horizontal, @config.subform.layout
+    end
+    
+    def test_setting_layout
+      layout = :vertical
+      @config.subform.layout = layout
+      assert_equal layout, @config.subform.layout
+    end
   end
 end

data/test/config/update_test.rb

@@ -1,40 +1,42 @@
-require File.join(File.dirname(__FILE__), '../test_helper.rb')
+require 'test_helper'
 
-class Config::UpdateTest < Test::Unit::TestCase
-  def setup
-    @config = ActiveScaffold::Config::Core.new :model_stub
+module Config
+  class UpdateTest < Test::Unit::TestCase
+    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
+      assert !@config.update.persistent
+      assert !@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
+      @config.update.nested_links = true
+      assert @config.update.nested_links
+    end
+    
+    def test_label
+      label = 'update new monkeys'
+      @config.update.label = label
+      assert_equal label, @config.update.label
+      I18n.backend.store_translations :en, :active_scaffold => {:change_model => 'Change %{model}'}
+      @config.update.label = :change_model
+      assert_equal 'Change Model stub', @config.update.label
+      assert_equal 'Change record', @config.update.label('record')
+    end
   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
-    assert !@config.update.persistent
-    assert !@config.update.nested_links
-    assert_equal 'Update ModelStub', @config.update.label
-  end
-  
-  def test_persistent
-    @config.update.persistent = true
-    assert @config.update.persistent
-  end
-  
-  def test_nested_links
-    @config.update.nested_links = true
-    assert @config.update.nested_links
-  end
-  
-  def test_label
-    label = 'update new monkeys'
-    @config.update.label = label
-    assert_equal label, @config.update.label
-    I18n.backend.store_translations :en, :active_scaffold => {:change_model => 'Change %{model}'}
-    @config.update.label = :change_model
-    assert_equal 'Change ModelStub', @config.update.label
-    assert_equal 'Change record', @config.update.label('record')
-  end
-end
+end

data/test/const_mocker.rb

@@ -1,34 +1,30 @@
 class ConstMocker
-  def initialize(*const_names)
-    @const_names = const_names
-    @const_states = {}
-    @const_names.each{|const_name|
-      @const_states[const_name] = Object.const_defined?(const_name) ? Object.const_get(const_name) : nil
-    }
+  def initialize(const_name, parent = Object)
+    @parent = parent
+    @const_name = const_name
+    @const_state = nil
+    @const_state = @parent.const_defined?(@const_name) ? @parent.const_get(@const_name) : nil
   end
   
   def remove
-    @const_names.each{|const_name|
-      Object.send :remove_const, const_name if Object.const_defined?(const_name)
-    }
+    @parent.send :remove_const, @const_name if @parent.const_defined?(@const_name)
   end
   
   def declare
-    @const_names.each{|const_name|
-      Object.class_eval "class #{const_name}; end;" unless Object.const_defined?(const_name)
-    }
+    @parent.const_set @const_name, Class.new
   end
   
   def restore
     remove
-    
-    @const_states.each_pair{|const_name, const|
-      Object.const_set const_name, const if const
-    }
+    @parent.const_set @const_name, @const_state if @const_state
+  end
+
+  def const
+    @parent.const_get @const_name if @parent.const_defined?(@const_name)
   end
   
-  def self.mock(*const_names, &block)
-    cm = new(*const_names)
+  def self.mock(const_name, parent = Object, &block)
+    cm = new(const_name, parent)
     yield(cm)
     cm.restore
     true