typus 3.1.0.rc6 → 3.1.0.rc7

data/test/lib/typus/orm/active_record/class_methods_test.rb

@@ -61,12 +61,8 @@ class ClassMethodsTest < ActiveSupport::TestCase
 
   end
 
-  context "typus_description" do
-
-    should "return the description of a model" do
-      assert_equal "System Users Administration", TypusUser.typus_description
-    end
-
+  test "typus_description returns the description of a model" do
+    assert_equal "System Users Administration", TypusUser.typus_description
   end
 
   context "typus_fields_for" do
@@ -103,8 +99,8 @@ class ClassMethodsTest < ActiveSupport::TestCase
 
     should "return form fields for Asset" do
       expected = [["caption", :string],
-                  ["dragonfly", :file],
-                  ["dragonfly_required", :file]]
+                  ["dragonfly", :dragonfly],
+                  ["dragonfly_required", :dragonfly]]
 
       assert_equal expected.map { |i| i.first }, Asset.typus_fields_for(:special).keys
       assert_equal expected.map { |i| i.last }, Asset.typus_fields_for(:special).values
@@ -172,210 +168,131 @@ class ClassMethodsTest < ActiveSupport::TestCase
 
   end
 
-  context "typus_actions_on" do
-
-    should "accept strings" do
-      assert_equal %w(cleanup), Post.typus_actions_on("index")
-    end
-
-    should "accept symbols" do
-      assert_equal %w(cleanup), Post.typus_actions_on(:index)
-    end
-
-    should "return actions on list for TypusUser" do
-      assert TypusUser.typus_actions_on(:list).empty?
-    end
-
-    should "return actions on edit for Post" do
-      assert_equal %w(send_as_newsletter preview), Post.typus_actions_on(:edit)
-    end
-
+  test "typus_actions_on accepts strings and symbols" do
+    assert_equal %w(cleanup), Post.typus_actions_on("index")
+    assert_equal %w(cleanup), Post.typus_actions_on(:index)
   end
 
-  context "typus_options_for" do
-
-    should "accept strings" do
-      assert Post.typus_options_for("form_rows").eql?(15)
-    end
-
-    should "accept symbols" do
-      assert Post.typus_options_for(:form_rows).eql?(15)
-    end
-
-    should "return nil when options do not exist" do
-      assert_nil TypusUser.typus_options_for(:unexisting)
-    end
-
-    should "return options for Post" do
-      assert Post.typus_options_for(:form_rows).eql?(15)
-    end
-
-    should "return options for Page" do
-      assert Page.typus_options_for(:form_rows).eql?(25)
-    end
-
-    should "return sortable options as a boolean" do
-      assert Post.typus_options_for(:sortable)
-      assert !Page.typus_options_for(:sortable)
-    end
-
+  test "typus_actions_on returns actions for our models" do
+    assert TypusUser.typus_actions_on(:list).empty?
+    assert_equal %w(send_as_newsletter preview), Post.typus_actions_on(:edit)
   end
 
-  context "typus_application" do
-
-    should "return application for Post" do
-      assert_equal "CRUD Extended", Post.typus_application
-    end
-
-    should "return application for View" do
-      assert_equal "Unknown", View.typus_application
-    end
-
+  test "typus_options_for accepts strings and symbols" do
+    assert Post.typus_options_for("form_rows").eql?(15)
+    assert Post.typus_options_for(:form_rows).eql?(15)
   end
 
-  context "typus_field_options_for" do
-
-    should "verify on models" do
-      assert_equal [:status], Post.typus_field_options_for(:selectors)
-      assert_equal [:permalink], Post.typus_field_options_for(:read_only)
-      assert_equal [:created_at], Post.typus_field_options_for(:auto_generated)
-    end
-
-    should "return empty array for unexisting option" do
-      assert Post.typus_field_options_for(:unexisting).empty?
-    end
-
+  test "typus_options_for returns nil when options do not exist" do
+    assert_nil TypusUser.typus_options_for(:unexisting)
   end
 
-  context "typus_boolean" do
-
-    should "accept strings" do
-      expected = [["Active", "true"], ["Inactive", "false"]]
-      assert_equal expected, TypusUser.typus_boolean("status")
-    end
-
-    should "accept symbols" do
-      expected = [["Active", "true"], ["Inactive", "false"]]
-      assert_equal expected, TypusUser.typus_boolean(:status)
-    end
-
-    should "return booleans for Post" do
-      expected = [["True", "true"], ["False", "false"]]
-      assert_equal expected, Post.typus_boolean(:status)
-    end
-
-    should "return booleans for Comment" do
-      expected = [["Yes, it's spam", "true"], ["No, it's not spam", "false"]]
-      assert_equal expected, Comment.typus_boolean(:spam)
-    end
-
+  test "typus_options_for returns options for models" do
+    assert Post.typus_options_for(:form_rows).eql?(15)
+    assert Page.typus_options_for(:form_rows).eql?(25)
   end
 
-  context "typus_date_format" do
-
-    should "accept strings" do
-      assert_equal :default, Post.typus_date_format("unknown")
-    end
-
-    should "accept symbols" do
-      assert_equal :default, Post.typus_date_format(:unknown)
-    end
-
-    should "return date_format for Post" do
-      assert_equal :default, Post.typus_date_format
-      assert_equal :short, Post.typus_date_format(:created_at)
-    end
-
+  test "typus_options_for returns sortable options as a boolean" do
+    assert Post.typus_options_for(:sortable)
+    assert !Page.typus_options_for(:sortable)
   end
 
-  context "typus_template" do
-
-    should "accept strings" do
-      assert_equal "datepicker", Post.typus_template("published_at")
-    end
-
-    should "accept symbols" do
-      assert_equal "datepicker", Post.typus_template(:published_at)
-    end
+  test "typus_application" do
+    assert_equal "CRUD Extended", Post.typus_application
+    assert_equal "Unknown", View.typus_application
+  end
 
-    should "return nil if template does not exist" do
-      assert_nil Post.typus_template(:created_at)
-    end
+  test "typus_field_options_for" do
+    assert_equal [:status], Post.typus_field_options_for(:selectors)
+    assert_equal [:permalink], Post.typus_field_options_for(:read_only)
+    assert_equal [:created_at], Post.typus_field_options_for(:auto_generated)
 
+    assert Post.typus_field_options_for(:unexisting).empty?
   end
 
-  context "typus_defaults_for" do
-
-    should "accept strings" do
-      assert_equal %w(title), Post.typus_defaults_for("search")
-    end
+  test "typus_boolean accepts string and symbols" do
+    expected = [["Active", "true"], ["Inactive", "false"]]
 
-    should "accepts symbols" do
-      assert_equal %w(title), Post.typus_defaults_for(:search)
-    end
+    assert_equal expected, TypusUser.typus_boolean("status")
+    assert_equal expected, TypusUser.typus_boolean(:status)
+  end
 
-    should "return default_for relationships on Post" do
-      assert_equal %w(categories comments views), Post.typus_defaults_for(:relationships)
-    end
+  test "typus_boolean returns custom keys" do
+    expected = [["True", "true"], ["False", "false"]]
+    assert_equal expected, Post.typus_boolean(:status)
 
+    expected = [["Yes, it's spam", "true"], ["No, it's not spam", "false"]]
+    assert_equal expected, Comment.typus_boolean(:spam)
   end
 
-  context "typus_search_fields" do
-
-    should "return a hash with the search modifiers" do
-      search = ["=id", "^title", "body"]
-      Post.stubs(:typus_defaults_for).with(:search).returns(search)
-      expected = {"body"=>"@", "title"=>"^", "id"=>"="}
-      assert_equal expected, Post.typus_search_fields
-    end
+  test "typus_date_format accepts string and symbols" do
+    assert_equal :default, Post.typus_date_format("unknown")
+    assert_equal :default, Post.typus_date_format(:unknown)
+  end
 
-    should "return and empty hash" do
-      search = []
-      Post.stubs(:typus_defaults_for).with(:search).returns(search)
-      expected = {}
-      assert_equal expected, Post.typus_search_fields
-    end
+  test "typus_date_format returns date_format for Post" do
+    assert_equal :default, Post.typus_date_format
+    assert_equal :short, Post.typus_date_format(:created_at)
+  end
 
+  test "typus_template accepts strings and symbols" do
+    assert_equal "datepicker", Post.typus_template("published_at")
+    assert_equal "datepicker", Post.typus_template(:published_at)
   end
 
-  context "typus_order_by" do
+  test "typus_template returns nil if template does not exist" do
+    assert_nil Post.typus_template(:created_at)
+  end
 
-    should "return defaults_for order_by on Post" do
-      assert_equal "posts.title ASC, posts.created_at DESC", Post.typus_order_by
-      assert_equal %w(title -created_at), Post.typus_defaults_for(:order_by)
-    end
+  test "typus_defaults_for accepts string and symbols" do
+    assert_equal %w(title), Post.typus_defaults_for("search")
+    assert_equal %w(title), Post.typus_defaults_for(:search)
+  end
 
+  test "typus_defaults_for returns default_for relationships on Post" do
+    assert_equal %w(categories comments views), Post.typus_defaults_for(:relationships)
   end
 
-  context "typus_user_id?" do
+  test "typus_search_fields returns a hash with the search modifiers" do
+    search = ["=id", "^title", "body"]
+    Post.stubs(:typus_defaults_for).with(:search).returns(search)
+    expected = {"body"=>"@", "title"=>"^", "id"=>"="}
+    assert_equal expected, Post.typus_search_fields
+  end
 
-    should "exist on Post" do
-      assert Post.typus_user_id?
-    end
+  test "typus_search_fields returns and empty hash" do
+    search = []
+    Post.stubs(:typus_defaults_for).with(:search).returns(search)
+    expected = {}
+    assert_equal expected, Post.typus_search_fields
+  end
 
-    should "not exist on TypusUser" do
-      assert !TypusUser.typus_user_id?
-    end
+  test "typus_order_by returns defaults_for order_by on Post" do
+    assert_equal "posts.title ASC, posts.created_at DESC", Post.typus_order_by
+    assert_equal %w(title -created_at), Post.typus_defaults_for(:order_by)
+  end
 
+  test "typus_user_id exists on post" do
+    assert Post.typus_user_id?
   end
 
-  context "read_model_config" do
+  test "typus_user_id does not exist on TypusUser" do
+    assert !TypusUser.typus_user_id?
+  end
 
-    should "return data for existing model" do
-      expected = {"application"=>"CRUD Extended",
-                  "fields"=>{"default"=>"caption, dragonfly, dragonfly_required",
-                             "special"=>"caption, dragonfly, dragonfly_required",
-                             "form"=>"caption, dragonfly, dragonfly_required, paperclip, paperclip_required",
-                             "new"=>"dragonfly, dragonfly_required, paperclip, paperclip_required"}}
-      assert_equal expected, Asset.read_model_config
-    end
+  test "read_model_config returns data for existing model" do
+    expected = {"application"=>"CRUD Extended",
+                "fields"=>{"default"=>"caption, dragonfly, dragonfly_required",
+                           "special"=>"caption, dragonfly, dragonfly_required",
+                           "form"=>"caption, dragonfly, dragonfly_required, paperclip, paperclip_required",
+                           "new"=>"dragonfly, dragonfly_required, paperclip, paperclip_required"}}
+    assert_equal expected, Asset.read_model_config
+  end
 
-    should "raise error when model does not exist on configuration" do
-      assert_raises RuntimeError do
-        Article.read_model_config
-      end
+  test "read_model_config raises an error when model does not exist on configuration" do
+    assert_raises RuntimeError do
+      Article.read_model_config
     end
-
   end
 
 end

data/test/lib/typus/resources_test.rb

@@ -2,10 +2,6 @@ require "test_helper"
 
 class ResourcesTest < ActiveSupport::TestCase
 
-  test "action_after_save" do
-    assert Typus::Resources.action_after_save.eql?('edit')
-  end
-
   test "default_action_on_item" do
     assert Typus::Resources.default_action_on_item.eql?('edit')
   end

data/test/test_helper.rb

@@ -15,6 +15,11 @@ class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
 
+  teardown do
+    reset_session
+    [Entry, Page, Post, TypusUser].each { |i| i.delete_all }
+  end
+
   def admin_sign_in
     @typus_user = Factory(:typus_user)
     set_session

data/typus.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "jquery-rails"
   s.add_development_dependency "paperclip"
   s.add_development_dependency "rack-cache"
-  s.add_development_dependency "rails-trash"
+  s.add_development_dependency "rails-trash", "~> 1.1.1"
 
   s.add_dependency "jquery-rails"
   s.add_dependency "kaminari"