active_scaffold 3.4.17 → 3.4.18

data/shoulda_macros/macros.rb

@@ -24,13 +24,14 @@ class ActiveSupport::TestCase
   end
 
   def self.should_render_as_form_ui(column_name, form_ui)
-    should "render column #{column_name} as #{form_ui} form_ui", :before => lambda{
+    before_block = lambda do
       @rendered_columns = []
-      @controller.view_context_class.any_instance.expects(:"active_scaffold_input_#{form_ui}").at_least_once.with {|column, options|
+      @controller.view_context_class.any_instance.expects(:"active_scaffold_input_#{form_ui}").at_least_once.with do |column, _|
         @rendered_columns << column.name
         true
-      }
-    } do
+      end
+    end
+    should "render column #{column_name} as #{form_ui} form_ui", :before => before_block do
       assert_equal form_ui, @controller.active_scaffold_config.columns[column_name].form_ui
       assert @rendered_columns.include?(column_name)
     end
@@ -38,7 +39,7 @@ class ActiveSupport::TestCase
 
   def self.should_render_with_options_for_select(column_name, *options)
     should "render column #{column_name} with options for select" do
-      converting_sort = lambda{|a,b| a.to_s <=> b.to_s}
+      converting_sort = ->(a, b) { a.to_s <=> b.to_s }
       assert_equal options.sort(&converting_sort), @controller.active_scaffold_config.columns[column_name].options[:options].sort(&converting_sort)
     end
   end
@@ -58,26 +59,28 @@ class ActiveSupport::TestCase
   end
 
   def self.should_render_as_form_hidden(column_name)
-    should "render column #{column_name} as form hidden", :before => lambda{
+    before_block = lambda do
       @rendered_columns = []
-      @controller.view_context_class.any_instance.expects(:"hidden_field").at_least_once.with {|object, method, options|
+      @controller.view_context_class.any_instance.expects(:"hidden_field").at_least_once.with do |_, method, _|
         @rendered_columns << method
         true
-      }
-    } do
-      assert_template :partial => "_form_hidden_attribute"
+      end
+    end
+    should "render column #{column_name} as form hidden", :before => before_block do
+      assert_template :partial => '_form_hidden_attribute'
       assert @rendered_columns.include?(column_name)
     end
   end
 
   def self.should_render_as_list_ui(column_name, list_ui)
-    should "render column #{column_name} as #{list_ui} list_ui", :before => lambda{
+    before_block = lambda do
       @rendered_columns = []
-      @controller.view_context_class.any_instance.expects(:"active_scaffold_column_#{list_ui}").at_least_once.with {|column, options|
+      @controller.view_context_class.any_instance.expects(:"active_scaffold_column_#{list_ui}").at_least_once.with do |column, _|
         @rendered_columns << column.name
         true
-      }
-    } do
+      end
+    end
+    should "render column #{column_name} as #{list_ui} list_ui", :before => before_block do
       assert_equal list_ui, @controller.active_scaffold_config.columns[column_name].list_ui
       assert @rendered_columns.include?(column_name)
     end
@@ -98,15 +101,16 @@ class ActiveSupport::TestCase
   end
 
   def self.should_render_as_inplace_edit(column_name)
-    should "render column #{column_name} as inplace edit", :before => lambda{
+    before_block = lambda do
       @column = @controller.active_scaffold_config.columns[column_name]
       @rendered_columns = []
       method = @column.list_ui == :checkbox ? :format_column_checkbox : :active_scaffold_inplace_edit
-      @controller.view_context_class.any_instance.expects(method).at_least_once.with {|model, column, options|
+      @controller.view_context_class.any_instance.expects(method).at_least_once.with do |_, column, _|
         @rendered_columns << column.name
         true
-      }
-    } do
+      end
+    end
+    should "render column #{column_name} as inplace edit", :before => before_block do
       assert @column.inplace_edit
       assert @rendered_columns.include?(column_name)
     end
@@ -120,17 +124,18 @@ class ActiveSupport::TestCase
     should "respond to parent #{description}" do
       script = block ? instance_eval(&block) : /.*/
       script = script.is_a?(Regexp) ? script.source : Regexp.quote(script)
-      script = script.gsub('\n', '\\\\\\n').
-        gsub(/['"]/, '\\\\\\\\\&').
-        gsub('</script>','</scr"+"ipt>')
+      script = script.gsub('\n', '\\\\\\n')
+               .gsub(/['"]/, '\\\\\\\\\&')
+               .gsub('</script>', '</scr"+"ipt>')
       assert_select 'script[type=text/javascript]', Regexp.new('.*' + Regexp.quote("with(window.parent) { setTimeout(function() { window.eval('") + script + Regexp.quote("'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };") + '.*')
     end
   end
 
   private
+
   def column_names(action)
     columns = []
-    @controller.active_scaffold_config.send(action).columns.each(:flatten => true) {|col| columns << col.name}
+    @controller.active_scaffold_config.send(action).columns.each(:flatten => true) { |col| columns << col.name }
     columns
   end
 end

data/test/bridges/bridge_test.rb

@@ -4,76 +4,85 @@ class BridgeTest < MiniTest::Test
   def setup
     @const_store = {}
   end
-  
+
   def teardown
   end
-  
+
   def test__shouldnt_throw_errors
     ActiveScaffold::Bridges.run_all
   end
-  
+
   def test__cds_bridge
     js, ActiveScaffold.js_framework = ActiveScaffold.js_framework, :prototype
-    ConstMocker.mock("CalendarDateSelect") do |cm|
+    ConstMocker.mock('CalendarDateSelect') do |cm|
       cm.remove
-      assert(! bridge_will_be_installed("CalendarDateSelect"))
+      assert(!bridge_will_be_installed('CalendarDateSelect'))
       cm.declare
-      assert(bridge_will_be_installed("CalendarDateSelect"))
+      assert(bridge_will_be_installed('CalendarDateSelect'))
     end
     ActiveScaffold.js_framework = js
   end
-  
+
   def test__file_column_bridge
-    ConstMocker.mock("FileColumn") do |cm|
-    cm.remove
-    assert(! bridge_will_be_installed("FileColumn"))
+    ConstMocker.mock('FileColumn') do |cm|
+      cm.remove
+      assert(!bridge_will_be_installed('FileColumn'))
       cm.declare
-      assert(bridge_will_be_installed("FileColumn"))
+      assert(bridge_will_be_installed('FileColumn'))
     end
   end
-  
+
   def test__paperclip_bridge
-    ConstMocker.mock("Paperclip") do |cm|
+    ConstMocker.mock('Paperclip') do |cm|
       cm.remove
-      assert(! bridge_will_be_installed("Paperclip"))
+      assert(!bridge_will_be_installed('Paperclip'))
       cm.declare
-      assert(bridge_will_be_installed("Paperclip"))
+      assert(bridge_will_be_installed('Paperclip'))
     end
   end
-  
+
   def test__date_picker_bridge
-    ConstMocker.mock("Jquery") do |jquery|
+    ConstMocker.mock('Jquery') do |jquery|
       jquery.declare
-      ConstMocker.mock("Rails", jquery.const) do |rails|
+      ConstMocker.mock('Rails', jquery.const) do |rails|
         rails.declare
-        ConstMocker.mock("Ui", jquery.const) do |cm|
+        ConstMocker.mock('Ui', jquery.const) do |cm|
           cm.remove
-          assert(! bridge_will_be_installed("DatePicker"))
+          assert(!bridge_will_be_installed('DatePicker'))
           cm.declare
-          assert(bridge_will_be_installed("DatePicker"))
+          assert(bridge_will_be_installed('DatePicker'))
         end
       end
     end
   end
-  
+
   def test__semantic_attributes_bridge
-    ConstMocker.mock("SemanticAttributes") do |cm|
+    ConstMocker.mock('SemanticAttributes') do |cm|
       cm.remove
-      assert(! bridge_will_be_installed("SemanticAttributes"))
+      assert(!bridge_will_be_installed('SemanticAttributes'))
       cm.declare
-      assert(bridge_will_be_installed("SemanticAttributes"))
+      assert(bridge_will_be_installed('SemanticAttributes'))
     end
   end
 
-protected
+  def test__paper_trail_bridge
+    ConstMocker.mock('PaperTrail') do |cm|
+      cm.remove
+      assert(!bridge_will_be_installed('PaperTrail'))
+      cm.declare
+      assert(bridge_will_be_installed('PaperTrail'))
+    end
+  end
+
+  protected
 
   def find_bridge(name)
     ActiveScaffold::Bridges[name.to_s.underscore.to_sym]
   end
-  
+
   def bridge_will_be_installed(name)
-    assert bridge=find_bridge(name), "No bridge found matching #{name}"
-    
+    assert bridge = find_bridge(name), "No bridge found matching #{name}"
+
     bridge.install?
   end
 end

data/test/bridges/date_picker_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/ext')
-#require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/helper')
+# require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/helper')
 
 class DatePickerTest < ActionView::TestCase
   include ActiveScaffold::Helpers::ViewHelpers

data/test/bridges/paper_trail_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+ActiveScaffold::Bridges::PaperTrail.prepare
+
+class PaperTrailTest < ActionController::TestCase
+  tests AddressesController
+
+  def test_deleted_route
+    with_routing do |map|
+      map.draw do
+        resources :addresses do
+          as_routes
+        end
+      end
+      assert_routing '/addresses/deleted', :controller => 'addresses', :action => 'deleted'
+    end
+  end
+end

data/test/bridges/paperclip_test.rb

@@ -16,7 +16,7 @@ class PaperclipTest < ActionView::TestCase
     config = PaperclipCore.new(:company)
     refute config.create.multipart?
     refute config.update.multipart?
-    refute config.columns.any? {|column| column.form_ui == :paperclip}
+    refute config.columns.any? { |column| column.form_ui == :paperclip }
   end
 
   def test_initialization
@@ -40,7 +40,7 @@ class PaperclipTest < ActionView::TestCase
 
     company.expects(:logo).returns(stub(:dirty? => false))
     company.expects(:logo=)
-    company.delete_logo = 'true'
+    company.delete_logo = 'true' # rubocop:disable Lint/UselessSetterCall
   end
 
   def test_list_ui
@@ -65,5 +65,6 @@ class PaperclipTest < ActionView::TestCase
 
     @record.stubs(:logo).returns(stub(:file? => false))
     assert_dom_equal '<input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" />', active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
+    ActiveScaffold.js_framework = js
   end
 end

data/test/bridges/tiny_mce_test.rb

@@ -7,20 +7,23 @@ class TinyMceTest < ActionView::TestCase
   def test_includes
     ActiveScaffold::Bridges::TinyMce.expects(:install?).returns(true)
     ActiveScaffold.js_framework = :jquery
-    assert ActiveScaffold::Bridges.all_javascripts.include?("tinymce-jquery")
+    assert ActiveScaffold::Bridges.all_javascripts.include?('tinymce-jquery')
   end
 
   def test_form_ui
     config = ActiveScaffold::Config::Core.new(:company)
     @record = Company.new
-    self.expects(:request).returns(stub(:xhr? => true))
+    expects(:request).returns(stub(:xhr? => true))
 
     assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"simple\"};tinyMCE.execCommand('mceAddControl', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => @record)
   end
 
   protected
+
   def include_tiny_mce_if_needed; end
+
   def tiny_mce_js; end
+
   def using_tiny_mce?
     true
   end

data/test/company.rb

@@ -1,13 +1,13 @@
 class Company < ActiveRecord::Base
   def initialize(with_or_without = nil)
-    @with_companies = with_or_without == :with_companies
-    @with_company = with_or_without == :with_company
-    @with_main_company = with_or_without == :with_main_company
+    @companies = with_or_without == :with_companies
+    @company = with_or_without == :with_company
+    @main_company = with_or_without == :with_main_company
     @attributes = {}
     @attributes_cache = {}
     @raw_attributes = {}
   end
-  
+
   def self.columns_hash
     {
       'name' => ColumnMock.new('name', nil, 'varchar(255)'),
@@ -16,28 +16,28 @@ class Company < ActiveRecord::Base
       'logo_file_name' => ColumnMock.new('logo_file_name', nil, 'varchar(255)'),
       'logo_content_type' => ColumnMock.new('logo_content_type', nil, 'varchar(255)'),
       'logo_file_size' => ColumnMock.new('logo_file_size', nil, 'int(11)'),
-      'logo_updated_at' => ColumnMock.new('logo_updated_at', nil, 'datetime'),
+      'logo_updated_at' => ColumnMock.new('logo_updated_at', nil, 'datetime')
     }
   end
 
   def self.columns
-    self.columns_hash.values
+    columns_hash.values
   end
-  
+
   def self.class_name
-    self.name
+    name
   end
-  
+
   def self.table_name
     'companies'
   end
-  
+
   def self.attachment_definitions
     {:logo => {}}
   end
-  
+
   # not the real signature of the method, but forgive me
-  def self.before_destroy(s=nil)
+  def self.before_destroy(s = nil)
     @@before = s
   end
 
@@ -52,40 +52,35 @@ class Company < ActiveRecord::Base
       ActiveRecord::Reflection.create *args
     end
   end
-  
+
   def self.has_many(association_id, options = {})
-    reflection = create_reflection(:has_many, association_id, nil, options, self)
+    create_reflection(:has_many, association_id, nil, options, self)
   end
   def self.has_one(association_id, options = {})
-    reflection = create_reflection(:has_one, association_id, nil, options, self)
+    create_reflection(:has_one, association_id, nil, options, self)
   end
   def self.belongs_to(association_id, options = {})
-    reflection = create_reflection(:belongs_to, association_id, nil, options, self)
+    create_reflection(:belongs_to, association_id, nil, options, self)
   end
   has_many :companies
   has_one :company
   belongs_to :main_company, :class_name => 'Company'
-  
+
   def companies
-    if @with_companies
+    if @companies
       [nil]
     else
       []
     end
   end
-  
-  def company
-    @with_company
-  end
-  
-  def main_company
-    @with_main_company
-  end
-  
-  def name
-  end
+
+  attr_reader :company
+  attr_reader :main_company
+
+  def name; end
+
   def name_before_type_cast
-    self.name.to_s
+    name.to_s
   end
 
   def date

data/test/config/base_test.rb

@@ -5,7 +5,7 @@ module Config
     def setup
       @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
     end
-    
+
     def test_formats
       assert_equal [], @base.formats
       @base.formats << :pdf

data/test/config/core_test.rb

@@ -9,7 +9,7 @@ module Config
       @config = ActiveScaffold::Config::Core.new :model_stub
       ModelStubsController.instance_variable_set :@active_scaffold_config, @config
     end
-    
+
     def test_default_options
       refute @config.add_sti_create_links?
       refute @config.sti_children
@@ -19,48 +19,48 @@ module Config
       assert_equal 'Model stub', @config.label(:count => 1)
       assert_equal 'ModelStubs', @config.label
     end
-    
+
     def test_add_sti_children
       @config.sti_create_links = true
       refute @config.add_sti_create_links?
       @config.sti_children = [:a]
       assert @config.add_sti_create_links?
     end
-    
+
     def test_sti_children
       @config.sti_children = [:a]
       assert_equal [:a], @config.sti_children
     end
-    
+
     def test_actions
       assert @config.actions.include?(:create)
       @config.actions = [:list]
       refute @config.actions.include?(:create)
       assert_equal [:list], @config.actions.to_a
     end
-    
+
     def test_form_ui_in_sti
       @config.columns << :type
-      
+
       @config.sti_create_links = false
       @config.sti_children = [:model_stub]
       @config._configure_sti
       assert_equal :select, @config.columns[:type].form_ui
       assert_equal [['Model stub', 'ModelStub']], @config.columns[:type].options[:options]
-      
+
       @config.columns[:type].form_ui = nil
       @config.sti_create_links = true
       @config._configure_sti
       assert_equal :hidden, @config.columns[:type].form_ui
     end
-    
+
     def test_sti_children_links
       @config.sti_children = [:model_stub]
       @config.sti_create_links = true
       @config.action_links.add @config.create.link
       ModelStubsController.send(:_add_sti_create_links)
       assert_equal 'Create Model stub', @config.action_links[:new].label
-      assert_equal 'config/core_test/model_stubs', @config.action_links[:new].parameters[:parent_sti]
+      assert_equal 'rb_config/core_test/model_stubs', @config.action_links[:new].parameters[:parent_sti]
     end
   end
 end