fix tests for ruby 2

Gemfile

@@ -15,7 +15,7 @@ end
 
 group :test do
   gem "shoulda", ">= 0"
-  gem "rcov", ">= 0"
+  gem "simplecov", ">= 0"
   gem "mocha"
   gem "rails", "~> 3.2.6"
   platforms :jruby do

Gemfile.lock

@@ -74,12 +74,15 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.1.0)
-    rcov (0.9.9)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     shoulda (2.11.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -105,7 +108,7 @@ DEPENDENCIES
   rack
   rails (~> 3.2.6)
   rake
-  rcov
   rdoc
   shoulda
+  simplecov
   sqlite3

test/bridges/date_picker_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+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')
 

test/bridges/paperclip_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/paperclip_bridge', __FILE__)
 require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers', __FILE__)
 require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/form_ui', __FILE__)

test/bridges/tiny_mce_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/tiny_mce/helpers')
 
 class TinyMceTest < ActionView::TestCase

test/config/base_test.rb

@@ -1,15 +1,17 @@
 require 'test_helper'
 
-class Config::BaseTest < Test::Unit::TestCase
-  def setup
-    @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
-  end
-
-  def test_formats
-    assert_equal [], @base.formats
-    @base.formats << :pdf
-    assert_equal [:pdf], @base.formats
-    @base.formats = [:html]
-    assert_equal [:html], @base.formats
+module Config
+  class BaseTest < Test::Unit::TestCase
+    def setup
+      @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
+    end
+
+    def test_formats
+      assert_equal [], @base.formats
+      @base.formats << :pdf
+      assert_equal [:pdf], @base.formats
+      @base.formats = [:html]
+      assert_equal [:html], @base.formats
+    end
   end
 end

test/config/core_test.rb

@@ -1,62 +1,64 @@
 require 'test_helper'
 
-class Config::CoreTest < Test::Unit::TestCase
-  class ModelStubsController < ActionController::Base; end
-  def setup
-    @config = ActiveScaffold::Config::Core.new :model_stub
-    ModelStubsController.instance_variable_set :@active_scaffold_config, @config
-  end
-
-  def test_default_options
-    assert !@config.add_sti_create_links?
-    assert !@config.sti_children
-    assert_equal [:create, :list, :search, :update, :delete, :show, :nested, :subform], @config.actions.to_a
-    assert_equal :default, @config.frontend
-    assert_equal :default, @config.theme
-    assert_equal 'Model stub', @config.label(:count => 1)
-    assert_equal 'ModelStubs', @config.label
-  end
-
-  def test_add_sti_children
-    @config.sti_create_links = true
-    assert !@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]
-    assert !@config.actions.include?(:create)
-    assert_equal [:list], @config.actions.to_a
-  end
-
-  def test_form_ui_in_sti
-    @config.columns << :type
+module Config
+  class CoreTest < Test::Unit::TestCase
+    class ModelStubsController < ActionController::Base; end
+    def setup
+      @config = ActiveScaffold::Config::Core.new :model_stub
+      ModelStubsController.instance_variable_set :@active_scaffold_config, @config
+    end
 
-    @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]
+    def test_default_options
+      assert !@config.add_sti_create_links?
+      assert !@config.sti_children
+      assert_equal [:create, :list, :search, :update, :delete, :show, :nested, :subform], @config.actions.to_a
+      assert_equal :default, @config.frontend
+      assert_equal :default, @config.theme
+      assert_equal 'Model stub', @config.label(:count => 1)
+      assert_equal 'ModelStubs', @config.label
+    end
 
-    @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]
+    def test_add_sti_children
+      @config.sti_create_links = true
+      assert !@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]
+      assert !@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]
+    end
   end
 end

test/config/create_test.rb

@@ -1,58 +1,60 @@
 require 'test_helper'
 
-class Config::CreateTest < Test::Unit::TestCase
-  def setup
-    @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
-    assert !@config.create.persistent
-    assert @config.create.action_after_create.nil?
-    assert_equal 'Create Model stub', @config.create.label
-  end
+module Config
+  class CreateTest < Test::Unit::TestCase
+    def setup
+      @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
+      assert !@config.create.persistent
+      assert @config.create.action_after_create.nil?
+      assert_equal 'Create Model stub', @config.create.label
+    end
 
-  def test_link_defaults
-    link = @config.create.link
-    assert !link.page?
-    assert !link.popup?
-    assert !link.confirm?
-    assert_equal "new", link.action
-    assert_equal "Create New", link.label
-    assert link.inline?
-    blank = {}
-    assert_equal blank, link.html_options
-    assert_equal :get, link.method
-    assert_equal :collection, link.type
-    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')
-    assert_not_equal(@default_link, @config.create.link)
-  end
-
-  def test_label
-    label = 'create new monkeys'
-    @config.create.label = label
-    assert_equal label, @config.create.label
-    I18n.backend.store_translations :en, :active_scaffold => {:create_new_model => 'Create new %{model}'}
-    @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
+    def test_link_defaults
+      link = @config.create.link
+      assert !link.page?
+      assert !link.popup?
+      assert !link.confirm?
+      assert_equal "new", link.action
+      assert_equal "Create New", link.label
+      assert link.inline?
+      blank = {}
+      assert_equal blank, link.html_options
+      assert_equal :get, link.method
+      assert_equal :collection, link.type
+      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')
+      assert_not_equal(@default_link, @config.create.link)
+    end
+
+    def test_label
+      label = 'create new monkeys'
+      @config.create.label = label
+      assert_equal label, @config.create.label
+      I18n.backend.store_translations :en, :active_scaffold => {:create_new_model => 'Create new %{model}'}
+      @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
+    end
   end
 end

test/config/delete_test.rb

@@ -1,33 +1,35 @@
 require 'test_helper'
 
-class Config::DeleteTest < Test::Unit::TestCase
-  def setup
-    @config = ActiveScaffold::Config::Core.new :model_stub
-    @default_link = @config.delete.link
-  end
-
-  def teardown
-    @config.delete.link = @default_link
-  end
+module Config
+  class DeleteTest < Test::Unit::TestCase
+    def setup
+      @config = ActiveScaffold::Config::Core.new :model_stub
+      @default_link = @config.delete.link
+    end
+
+    def teardown
+      @config.delete.link = @default_link
+    end
 
-  def test_link_defaults
-    link = @config.delete.link
-    assert !link.page?
-    assert !link.popup?
-    assert link.confirm?
-    assert_equal "destroy", link.action
-    assert_equal "Delete", link.label
-    assert link.inline?
-    blank = {}
-    assert_equal blank, link.html_options
-    assert_equal :delete, link.method
-    assert_equal :member, link.type
-    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')
-    assert_not_equal(@default_link, @config.delete.link)
+    def test_link_defaults
+      link = @config.delete.link
+      assert !link.page?
+      assert !link.popup?
+      assert link.confirm?
+      assert_equal "destroy", link.action
+      assert_equal "Delete", link.label
+      assert link.inline?
+      blank = {}
+      assert_equal blank, link.html_options
+      assert_equal :delete, link.method
+      assert_equal :member, link.type
+      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')
+      assert_not_equal(@default_link, @config.delete.link)
+    end
   end
 end