dry_crud 1.2.7 → 1.3.0

data/lib/generators/dry_crud/templates/test/unit/custom_assertions_test.rb

@@ -7,58 +7,62 @@ class CustomAssertionsTest < ActiveSupport::TestCase
   include CustomAssertions
 
   include CrudTestHelper
-  
+
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
   
+  AssertionException = RUBY_VERSION.to_f == 1.9 ? 
+                        MiniTest::Assertion : 
+                        Test::Unit::AssertionFailedError
+  
   test "assert include succeeds if included" do
     assert_nothing_raised do
       assert_include [1,2,3], 2
     end
   end
-  
+
   test "assert include succeeds if record included" do
     assert_nothing_raised do
       assert_include CrudTestModel.all, crud_test_models("AAAAA")
     end
   end
-  
+
   test "assert include fails if not included" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_include [1,2,3], 5
     end
   end
-  
+
   test "assert not include succeeds if not included" do
     assert_nothing_raised do
       assert_not_include [1,2,3], 5
     end
   end
-  
+
   test "assert not include fails if included" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_not_include [1,2,3], 3
     end
   end
-  
+
   test "assert count succeeds if count matches" do
     assert_nothing_raised do
       assert_count 3, "ba", "barbabapa"
     end
   end
-  
+
   test "assert count succeeds if count is zero" do
     assert_nothing_raised do
       assert_count 0, "bo", "barbabapa"
     end
   end
-  
+
   test "assert count fails if count does not match" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_count 2, "ba", "barbabapa"
     end
   end
-  
+
   test "assert valid record succeeds" do
     assert_nothing_raised do
       assert_valid crud_test_models("AAAAA")
@@ -66,48 +70,48 @@ class CustomAssertionsTest < ActiveSupport::TestCase
   end
 
   test "assert valid record fails for invalid" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_valid invalid_record
     end
   end
-  
+
   test "assert not valid succeeds if record invalid" do
     assert_nothing_raised do
       assert_not_valid invalid_record
     end
   end
-  
+
   test "assert not valid succeds if record invalid and invalid attrs given" do
     assert_nothing_raised do
       assert_not_valid invalid_record, :name, :rating
     end
   end
-  
+
   test "assert not valid fails if record valid" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_not_valid crud_test_models("AAAAA")
     end
   end
-  
+
   test "assert not valid fails if record invalid and valid attrs given" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_not_valid invalid_record, :name, :rating, :children
     end
   end
-  
+
   test "assert not valid fails if record invalid and not all invalid attrs given" do
-    assert_raise(Test::Unit::AssertionFailedError) do
+    assert_raise(AssertionException) do
       assert_not_valid invalid_record, :name
     end
   end
-  
+
   private
-  
+
   def invalid_record
     m = crud_test_models("AAAAA")
     m.name = nil
     m.rating = 42
     m
   end
-  
+
 end

data/lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb

@@ -3,82 +3,82 @@ require 'crud_test_model'
 require 'custom_assertions'
 
 class CrudHelperTest < ActionView::TestCase
-  
+
   REGEXP_ROWS = /<tr.+?<\/tr>/m
   REGEXP_HEADERS = /<th.+?<\/th>/m
   REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m
   REGEXP_ACTION_CELL = /<td class=\"center\"><a href.+?<\/a><\/td>/m
-  
+
   include CustomAssertions
   include StandardHelper
   include ListHelper
   include CrudTestHelper
-  
+
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
-  
+
   test "standard crud table" do
     @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
+
+    t = with_test_routing do
       crud_table
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
-    assert_count 11, REGEXP_SORT_HEADERS, t
+    assert_count 13, REGEXP_SORT_HEADERS, t
     assert_count 18, REGEXP_ACTION_CELL, t      # show, edit, delete links
   end
-  
+
   test "custom crud table with attributes" do
     @entries = CrudTestModel.all
-    
+
     t = with_test_routing do
       crud_table :name, :children, :companion_id
     end
-        
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 3, REGEXP_SORT_HEADERS, t
     assert_count 18, REGEXP_ACTION_CELL, t      # show, edit, delete links
   end
-    
+
   test "custom crud table with block" do
     @entries = CrudTestModel.all
-    
+
     t = with_test_routing do
       crud_table do |t|
         t.attrs :name, :children, :companion_id
         t.col("head") {|e| content_tag :span, e.income.to_s }
       end
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 4, REGEXP_HEADERS, t
     assert_count 6, /<span>.+?<\/span>/m, t
     assert_count 0, REGEXP_ACTION_CELL, t      # no show, edit, delete links
   end
-  
+
   test "custom crud table with attributes and block" do
     @entries = CrudTestModel.all
-    
+
     t = with_test_routing do
       crud_table :name, :children, :companion_id do |t|
         t.col("head") {|e| content_tag :span, e.income.to_s }
       end
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 4, REGEXP_HEADERS, t
     assert_count 6, /<span>.+?<\/span>/m, t
     assert_count 0, REGEXP_ACTION_CELL, t      # no show, edit, delete links
   end
-  
-  
+
+
   test "crud form" do
     @entry = CrudTestModel.first
     f = with_test_routing do
       capture { crud_form }
     end
-    
+
     assert_match /form .*?action="\/crud_test_models\/#{@entry.id}"/, f
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text"/, f
     assert_match /input .*?name="crud_test_model\[whatever\]" .*?type="text"/, f
@@ -90,19 +90,5 @@ class CrudHelperTest < ActionView::TestCase
     assert_match /select .*?name="crud_test_model\[companion_id\]"/, f
     assert_match /textarea .*?name="crud_test_model\[remarks\]"/, f
   end
-  
-  # Controller helper methods for the tests
-  
-  def model_class
-    CrudTestModel
-  end
-  
-  def params
-  	{}
-  end
-  
-  def sortable?(attr)
-  	true
-  end
 
 end

data/lib/generators/dry_crud/templates/test/unit/helpers/list_helper_test.rb

@@ -3,137 +3,123 @@ require 'crud_test_model'
 require 'custom_assertions'
 
 class ListHelperTest < ActionView::TestCase
-  
+
   REGEXP_ROWS = /<tr.+?<\/tr>/m
   REGEXP_HEADERS = /<th.+?<\/th>/m
   REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m
-  
+
   include StandardHelper
   include CrudTestHelper
   include CustomAssertions
-  
+
   setup :reset_db, :setup_db, :create_test_data
   teardown :reset_db
-  
+
   test "standard list table" do
     @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
+
+    t = with_test_routing do
       list_table
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
-    assert_count 11, REGEXP_SORT_HEADERS, t
+    assert_count 13, REGEXP_SORT_HEADERS, t
   end
-  
+
   test "custom list table with attributes" do
     @entries = CrudTestModel.all
-    
+
     t = with_test_routing do
       list_table :name, :children, :companion_id
     end
-        
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 3, REGEXP_SORT_HEADERS, t
   end
-    
+
   test "custom list table with block" do
     @entries = CrudTestModel.all
-    
+
     t = with_test_routing do
       list_table do |t|
         t.attrs :name, :children, :companion_id
         t.col("head") {|e| content_tag :span, e.income.to_s }
       end
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 4, REGEXP_HEADERS, t
     assert_count 0, REGEXP_SORT_HEADERS, t
     assert_count 6, /<span>.+?<\/span>/, t
   end
-  
+
   test "custom list table with attributes and block" do
     @entries = CrudTestModel.all
-    
+
     t = with_test_routing do
       list_table :name, :children, :companion_id do |t|
         t.col("head") {|e| content_tag :span, e.income.to_s }
       end
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 3, REGEXP_SORT_HEADERS, t
     assert_count 4, REGEXP_HEADERS, t
     assert_count 6, /<span>.+?<\/span>/, t
   end
-    
+
   test "standard list table with ascending sort params" do
     def params
       {:sort => 'children', :sort_dir => 'asc'}
     end
-  
+
     @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
+
+    t = with_test_routing do
       list_table
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
-    assert_count 10, REGEXP_SORT_HEADERS, t
+    assert_count 12, REGEXP_SORT_HEADERS, t
     assert_count 1, /<th><a .*?sort_dir=desc.*?>Children<\/a> &darr;<\/th>/, t
   end
-  
+
   test "standard list table with descending sort params" do
     def params
       {:sort => 'children', :sort_dir => 'desc'}
     end
-  
+
     @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
+
+    t = with_test_routing do
       list_table
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
-    assert_count 10, REGEXP_SORT_HEADERS, t
+    assert_count 12, REGEXP_SORT_HEADERS, t
     assert_count 1, /<th><a .*?sort_dir=asc.*?>Children<\/a> &uarr;<\/th>/, t
   end
-    
+
   test "list table with custom column sort params" do
     def params
       {:sort => 'chatty', :sort_dir => 'asc'}
     end
-  
+
     @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
+
+    t = with_test_routing do
       list_table :name, :children, :chatty
     end
-    
+
     assert_count 7, REGEXP_ROWS, t
     assert_count 2, REGEXP_SORT_HEADERS, t
     assert_count 1, /<th><a .*?sort_dir=desc.*?>Chatty<\/a> &darr;<\/th>/, t
   end
-  
-  test "default attributes do not include id" do 
-    assert_equal [:name, :whatever, :children, :companion_id, :rating, :income, 
-                  :birthdate, :human, :remarks, :created_at, :updated_at], default_attrs
-  end
-  
-  # Controller helper methods for the tests
-  
-  def model_class
-    CrudTestModel
-  end
-  
-  def params
-  	{}
-  end
-  
-  def sortable?(attr)
-  	true
+
+  test "default attributes do not include id" do
+    assert_equal [:name, :whatever, :children, :companion_id, :rating, :income,
+                  :birthdate, :gets_up_at, :last_seen, :human, :remarks,
+                  :created_at, :updated_at], default_attrs
   end
 
-    
 end

data/lib/generators/dry_crud/templates/test/unit/helpers/render_inheritable_test.rb

@@ -4,28 +4,28 @@ TEST_VIEW_PATH = File.join(Rails.root, 'test', 'test_views')
 
 class RootController < ApplicationController
   include RenderInheritable
-  
+
   attr_accessor :default_template_format
-  
+
   append_view_path(TEST_VIEW_PATH)
-  
+
   def initialize(*args)
     super(*args)
     self.default_template_format = :html
   end
-  
+
   def view_paths
     self.class.view_paths
   end
-  
+
 end
 
 class ChildrenController < RootController
-  
+
 end
 
 class GrandChildrenController < ChildrenController
-  
+
 end
 
 # mock File object
@@ -34,12 +34,12 @@ class File
     def touched
       @touched ||= []
     end
-    
+
     alias_method :orig_exists?, :exists?
     def exists?(filename, *args)
       touched.include?(filename) || orig_exists?(filename, *args)
     end
-    
+
     def touch_template(file)
       touched << File.join(ActionController::Base.view_paths.first, "#{file}.html.erb")
     end
@@ -47,9 +47,9 @@ class File
 end
 
 class RenderInheritableTest < ActiveSupport::TestCase
- 
+
   attr_reader :controller, :grand_controller
- 
+
   def setup
     teardown
     @controller = ChildrenController.new
@@ -57,7 +57,7 @@ class RenderInheritableTest < ActiveSupport::TestCase
     ChildrenController.send(:inheritable_cache).clear
     GrandChildrenController.send(:inheritable_cache).clear
   end
-  
+
   def teardown
     FileUtils.rm_rf(TEST_VIEW_PATH)
   end
@@ -72,82 +72,82 @@ class RenderInheritableTest < ActiveSupport::TestCase
     assert_equal ['children', 'root'], ChildrenController.send(:inheritance_lookup_path)
     assert_equal ['grand_children', 'children', 'root'], GrandChildrenController.send(:inheritance_lookup_path)
   end
-  
+
   test "inheritable controller finds controller instance" do
     assert_equal 'children', ChildrenController.send(:inheritable_controller)
     assert_equal 'grand_children', GrandChildrenController.send(:inheritable_controller)
   end
-    
+
   test "find non-existing inheritable file" do
     assert_nil @controller.send(:find_inheritable_template_folder, 'foo')
   end
-  
+
   test "find inheritable file not overwritten" do
     touch("root/root.html.erb")
-    
+
     assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'root')
     assert_equal 'root', @grand_controller.send(:find_inheritable_template_folder, 'root')
   end
-  
+
   test "find inheritable file partially overwritten" do
     touch("root/child.html.erb")
     touch("children/child.html.erb")
-    
+
     assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'child')
     assert_equal 'children', @grand_controller.send(:find_inheritable_template_folder, 'child')
   end
-  
+
   test "find inheritable file partially overwritten with gaps" do
     touch("root/grandchild.html.erb")
     touch("grand_children/grandchild.rhtml")
-    
+
     assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild')
     assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild')
   end
-    
+
   test "find inheritable file for js format" do
     touch("root/_grandchild.js.rjs")
     touch("grand_children/_grandchild.js.rjs")
-       
+
     assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild', true)
     assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild', true)
-        
+
     assert_equal({:js => { true => {'grandchild' => {nil => 'root'}}}}, ChildrenController.send(:inheritable_cache))
     assert_equal({:js => { true => {'grandchild' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
   end
-  
+
   test "find inheritable file for xml format" do
     touch("root/_grandchild.xml.builder")
     touch("grand_children/_grandchild.xml.builder")
-    
+
     assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild', true)
     assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild', true)
   end
-  
+
   test "find inheritable file all overwritten" do
     touch("root/all.html.erb")
     touch("children/all.rhtml")
     touch("grand_children/all.html.erb")
-    
+
     assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'all')
     assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'all')
-    
+
     assert_equal({:html => { false => { 'all' => {nil => 'children'}}}}, ChildrenController.send(:inheritable_cache))
     assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
-    
+
     assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'all')
     assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'all')
-    
+
     assert_equal({:html => { false => { 'all' => {nil => 'children'}}}}, ChildrenController.send(:inheritable_cache))
-    assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))    
+    assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
   end
 
   private
-  
+
   def touch(file)
     f = File.join(TEST_VIEW_PATH, file)
     FileUtils.mkdir_p(File.dirname(f))
     FileUtils.touch(f)
   end
-  
+
 end