active_scaffold 3.3.3 → 3.4.0

data/test/config/create_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class CreateTest < Test::Unit::TestCase
+  class CreateTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.create.link
@@ -12,16 +12,16 @@ module Config
     end
     
     def test_default_options
-      assert !@config.create.persistent
+      refute @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?
+      refute link.page?
+      refute link.popup?
+      refute link.confirm?
       assert_equal "new", link.action
       assert_equal "Create New", link.label
       assert link.inline?
@@ -35,7 +35,7 @@ module Config
     
     def test_setting_link
       @config.create.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
-      assert_not_equal(@default_link, @config.create.link)
+      refute_equal @default_link, @config.create.link
     end
     
     def test_label

data/test/config/delete_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class DeleteTest < Test::Unit::TestCase
+  class DeleteTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.delete.link
@@ -13,8 +13,8 @@ module Config
 
     def test_link_defaults
       link = @config.delete.link
-      assert !link.page?
-      assert !link.popup?
+      refute link.page?
+      refute link.popup?
       assert link.confirm?
       assert_equal "destroy", link.action
       assert_equal "Delete", link.label
@@ -29,7 +29,7 @@ module Config
     
     def test_setting_link
       @config.delete.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
-      assert_not_equal(@default_link, @config.delete.link)
+      refute_equal @default_link, @config.delete.link
     end
   end
 end

data/test/config/field_search_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class FieldSearchTest < Test::Unit::TestCase
+  class FieldSearchTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @config.actions.swap :search, :field_search
@@ -22,14 +22,14 @@ module Config
       @config.field_search.text_search = :end
       assert_equal :end, @config.field_search.text_search
       @config.field_search.text_search = false
-      assert !@config.field_search.text_search
+      refute @config.field_search.text_search
     end
 
     def test_link_defaults
       link = @config.field_search.link
-      assert !link.page?
-      assert !link.popup?
-      assert !link.confirm?
+      refute link.page?
+      refute link.popup?
+      refute link.confirm?
       assert_equal "show_search", link.action
       assert_equal "Search", link.label
       assert link.inline?
@@ -43,7 +43,7 @@ module Config
     
     def test_setting_link
       @config.field_search.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
-      assert_not_equal(@default_link, @config.field_search.link)
+      refute_equal @default_link, @config.field_search.link
     end
   end
 end

data/test/config/list_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class ListTest < Test::Unit::TestCase
+  class ListTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end
@@ -21,11 +21,11 @@ module Config
       assert_equal '-', @config.list.empty_field_text
       assert_equal ', ', @config.list.association_join_text
       assert_equal true, @config.list.pagination
-      assert_equal 'search', @config.list.search_partial
+      assert_equal nil, @config.list.search_partial
       assert_equal :no_entries, @config.list.no_entries_message
       assert_equal :filtered, @config.list.filtered_message
-      assert !@config.list.always_show_create
-      assert !@config.list.always_show_search
+      refute @config.list.always_show_create
+      refute @config.list.always_show_search
       assert @config.list.count_includes.nil?
       assert_equal 'ModelStubs', @config.list.label
       assert @config.list.sorting.sorts_on?(:id)
@@ -56,21 +56,21 @@ module Config
       @config.list.pagination = :infinite
       assert_equal :infinite, @config.list.pagination
       @config.list.pagination = false
-      assert !@config.list.pagination
+      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)
-      assert !@config.list.sorting.sorts_on?(:id)
+      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)
       assert @config.list.sorting.sorts_on?(:b)
       assert_equal 'DESC', @config.list.sorting.direction_of(:b)
-      assert !@config.list.sorting.sorts_on?(:id)
+      refute @config.list.sorting.sorts_on?(:id)
     end
     
     def test_per_page

data/test/config/nested_test.rb

@@ -1,8 +1,9 @@
 require 'test_helper'
 
 module Config
-  class NestedTest < Test::Unit::TestCase
+  class NestedTest < MiniTest::Test
     class ModelStubsController < ActionController::Base
+      include ActiveScaffold::Core
       active_scaffold
     end
 
@@ -19,8 +20,8 @@ module Config
       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
+      I18n.backend.store_translations :en, :active_scaffold => {:test_create_model => 'Add new %{model}'}
+      @config.nested.label = :test_create_model
       assert_equal 'Add new Model stub', @config.nested.label
     end
     
@@ -30,7 +31,7 @@ module Config
     end
     
     def test_add_link
-      assert_raise(ArgumentError) { @config.nested.add_link :assoc_1 }
+      assert_raises(ArgumentError) { @config.nested.add_link :assoc_1 }
       config = @config
       ModelStubsController.class_eval do
         config.configure { nested.add_link :other_models }
@@ -39,9 +40,9 @@ module Config
       assert_equal 'ModelStubs', link.label
       assert_equal 'index', link.action
       assert_equal :after, link.position
-      assert !link.page?
-      assert !link.popup?
-      assert !link.confirm?
+      refute link.page?
+      refute link.popup?
+      refute link.confirm?
       assert link.inline?
       assert link.refresh_on_close
       assert_equal :other_models, link.parameters[:association]

data/test/config/search_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class SearchTest < Test::Unit::TestCase
+  class SearchTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.search.link
@@ -13,7 +13,7 @@ module Config
     
     def test_default_options
       assert_equal :full, @config.search.text_search
-      assert !@config.search.live?
+      refute @config.search.live?
       assert_equal ' ', @config.search.split_terms
     end
     
@@ -23,7 +23,7 @@ module Config
       @config.search.text_search = :end
       assert_equal :end, @config.search.text_search
       @config.search.text_search = false
-      assert !@config.search.text_search
+      refute @config.search.text_search
     end
     
     def test_live
@@ -40,9 +40,9 @@ module Config
 
     def test_link_defaults
       link = @config.search.link
-      assert !link.page?
-      assert !link.popup?
-      assert !link.confirm?
+      refute link.page?
+      refute link.popup?
+      refute link.confirm?
       assert_equal "show_search", link.action
       assert_equal "Search", link.label
       assert link.inline?
@@ -56,7 +56,7 @@ module Config
     
     def test_setting_link
       @config.search.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
-      assert_not_equal(@default_link, @config.search.link)
+      refute_equal @default_link, @config.search.link
     end
   end
 end

data/test/config/show_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class ShowTest < Test::Unit::TestCase
+  class ShowTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.show.link
@@ -13,9 +13,9 @@ module Config
     
     def test_link_defaults
       link = @config.show.link
-      assert !link.page?
-      assert !link.popup?
-      assert !link.confirm?
+      refute link.page?
+      refute link.popup?
+      refute link.confirm?
       assert_equal "show", link.action
       assert_equal "Show", link.label
       assert link.inline?
@@ -29,7 +29,7 @@ module Config
     
     def test_setting_link
       @config.show.link = ActiveScaffold::DataStructures::ActionLink.new('update', :label => 'Monkeys')
-      assert_not_equal(@default_link, @config.show.link)
+      refute_equal @default_link, @config.show.link
     end
     
     def test_label

data/test/config/subform_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class SubformTest < Test::Unit::TestCase
+  class SubformTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end

data/test/config/update_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class UpdateTest < Test::Unit::TestCase
+  class UpdateTest < MiniTest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end
@@ -14,8 +14,8 @@ module Config
     end
     
     def test_default_options
-      assert !@config.update.persistent
-      assert !@config.update.nested_links
+      refute @config.update.persistent
+      refute @config.update.nested_links
       assert_equal 'Model stub', @config.update.label
     end
     
@@ -25,8 +25,9 @@ module Config
     end
     
     def test_nested_links
-      @config.update.nested_links = true
+      old, @config.update.nested_links = @config.update.nested_links, true
       assert @config.update.nested_links
+      @config.update.nested_links = old
     end
     
     def test_label

data/test/data_structures/action_columns_test.rb

@@ -2,62 +2,61 @@ require 'test_helper'
 # require 'test/model_stub'
 #require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
 
-class ActionColumnsTest < Test::Unit::TestCase
+class ActionColumnsTest < MiniTest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::ActionColumns.new([:a, :b])
   end
 
   def test_label
-    assert_nothing_raised do
-      @columns.label = 'foo';
-    end
-    assert @columns.label == 'foo'
+    refute_equal 'foo', @columns.label
+    @columns.label = 'foo'
+    assert_equal 'foo', @columns.label
   end
 
   def test_initialization
     assert @columns.include?(:a)
     assert @columns.include?(:b)
-    assert !@columns.include?(:c)
+    refute @columns.include?(:c)
   end
 
   def test_exclude
     # exclude with a symbol
     assert @columns.include?(:b)
     @columns.exclude :b
-    assert !@columns.include?(:b)
+    refute @columns.include?(:b)
 
     # exclude with a string
     assert @columns.include?(:a)
     @columns.exclude 'a'
-    assert !@columns.include?(:a)
+    refute @columns.include?(:a)
   end
 
   def test_exclude_array
     # exclude with a symbol
     assert @columns.include?(:b)
     @columns.exclude [:a, :b]
-    assert !@columns.include?(:b)
-    assert !@columns.include?(:a)
+    refute @columns.include?(:b)
+    refute @columns.include?(:a)
   end
 
   def test_add
     # try adding a simple column using a string
-    assert !@columns.include?(:c)
+    refute @columns.include?(:c)
     @columns.add 'c'
     assert @columns.include?(:c)
 
     # try adding a simple column using a symbol
-    assert !@columns.include?(:d)
+    refute @columns.include?(:d)
     @columns.add :d
     assert @columns.include?(:d)
 
     # test that << also adds
-    assert !@columns.include?(:e)
+    refute @columns.include?(:e)
     @columns << :e
     assert @columns.include?(:e)
 
     # try adding an array of columns
-    assert !@columns.include?(:f)
+    refute @columns.include?(:f)
     @columns.add [:f, :g]
     assert @columns.include?(:f)
     assert @columns.include?(:g)
@@ -92,7 +91,7 @@ class ActionColumnsTest < Test::Unit::TestCase
     end
 
     assert @columns.include?(:c)
-    assert !@columns.include?(:b)
+    refute @columns.include?(:b)
     @columns.each { |c|
       next unless c.is_a? ActiveScaffold::DataStructures::Columns
       assert c.include?(:e)
@@ -108,6 +107,6 @@ class ActionColumnsTest < Test::Unit::TestCase
     assert @columns.include?(:a)
     assert @columns.include?(:b)
     assert @columns.include?(:c)
-    assert !@columns.include?(:d)
+    refute @columns.include?(:d)
   end
 end

data/test/data_structures/action_link_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionLinkTest < Test::Unit::TestCase
+class ActionLinkTest < MiniTest::Test
   def setup
     @link = ActiveScaffold::DataStructures::ActionLink.new('foo')
   end
@@ -17,7 +17,7 @@ class ActionLinkTest < Test::Unit::TestCase
     @link.label = 'hello world'
     assert_equal 'hello world', @link.label
 
-    assert !@link.confirm
+    refute @link.confirm
     @link.confirm = true
     assert @link.confirm
 
@@ -57,22 +57,22 @@ class ActionLinkTest < Test::Unit::TestCase
   def test_presentation_style
     # default
     assert @link.inline?
-    assert !@link.popup?
-    assert !@link.page?
+    refute @link.popup?
+    refute @link.page?
 
     @link.popup = true
-    assert !@link.inline?
+    refute @link.inline?
     assert @link.popup?
-    assert !@link.page?
+    refute @link.page?
 
     @link.page = true
-    assert !@link.inline?
-    assert !@link.popup?
+    refute @link.inline?
+    refute @link.popup?
     assert @link.page?
 
     @link.inline = true
     assert @link.inline?
-    assert !@link.popup?
-    assert !@link.page?
+    refute @link.popup?
+    refute @link.page?
   end
 end