typus 1.0.0.pre8 → 1.0.0.pre9

data/test/functional/admin/session_controller_test.rb

@@ -58,7 +58,7 @@ class Admin::SessionControllerTest < ActionController::TestCase
 
       post :create, { :typus_user => { :email => typus_user.email, :password => "12345678" } }
 
-      assert @request.session[:typus_user_id].nil?
+      assert_nil @request.session[:typus_user_id]
       assert_response :redirect
       assert_redirected_to new_admin_session_path
     end
@@ -74,7 +74,7 @@ class Admin::SessionControllerTest < ActionController::TestCase
     should "destroy" do
       delete :destroy
 
-      assert @request.session[:typus_user_id].nil?
+      assert_nil @request.session[:typus_user_id]
       assert_response :redirect
       assert_redirected_to new_admin_session_path
       assert flash.empty?

data/test/functional/admin/{resources_controller_typus_users_test.rb → typus_users_controller_test.rb}

@@ -35,7 +35,7 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
     end
 
     should "not be able to destroy herself" do
-      assert_difference('TypusUser.count', 0) do
+      assert_no_difference('TypusUser.count') do
         delete :destroy, :id => @typus_user.id
       end
 
@@ -77,7 +77,7 @@ class Admin::TypusUsersControllerTest < ActionController::TestCase
 
       assert_response :redirect
       assert_redirected_to @request.env['HTTP_REFERER']
-      assert_equal "Editor can't perform action. (new)", flash[:notice].to_s
+      assert_equal "Editor can't perform action. (new)", flash[:notice]
     end
 
   end

data/test/helpers/admin/base_helper_test.rb

@@ -8,62 +8,60 @@ class Admin::BaseHelperTest < ActiveSupport::TestCase
   include ActionView::Helpers::TextHelper
 
   def render(*args); args; end
+  # include ActionView::Rendering
+  # include ActionView::Partials
 
-=begin
+  context "header" do
 
-  def test_header_with_root_path
+    should_eventually "render with root_path" do
 
-    # ActionView::Helpers::UrlHelper does not support strings, which are returned by named routes
-    # link root_path
-    self.stubs(:link_to).returns(%(<a href="/">View site</a>))
-    self.stubs(:link_to_unless_current).returns(%(<a href="/admin/dashboard">Dashboard</a>))
+      # ActionView::Helpers::UrlHelper does not support strings, which are 
+      # returned by named routes link root_path
+      self.stubs(:link_to).returns(%(<a href="/">View site</a>))
+      self.stubs(:link_to_unless_current).returns(%(<a href="/admin/dashboard">Dashboard</a>))
 
-    output = header
+      output = header
 
-    partial = "admin/helpers/header"
-    options = { :links => [ %(<a href="/admin/dashboard">Dashboard</a>),
-                            %(<a href="/admin/dashboard">Dashboard</a>),
-                            %(<a href="/">View site</a>) ] }
+      partial = "admin/helpers/header"
+      options = { :links => [ %(<a href="/admin/dashboard">Dashboard</a>),
+                              %(<a href="/admin/dashboard">Dashboard</a>),
+                              %(<a href="/">View site</a>) ] }
 
-    assert_equal [ partial, options ], output
+      assert_equal [ partial, options ], output
 
-  end
-
-=end
+    end
 
-=begin
+    should_eventually "render without root_path" do
 
-  def test_header_without_root_path
+      Rails.application.routes.named_routes.routes.reject! { |key, route| key == :root }
 
-    Rails.application.routes.named_routes.routes.reject! { |key, route| key == :root }
+      self.stubs(:link_to_unless_current).returns(%(<a href="/admin/dashboard">Dashboard</a>))
 
-    self.stubs(:link_to_unless_current).returns(%(<a href="/admin/dashboard">Dashboard</a>))
+      output = header
+      partial = "admin/helpers/header"
+      options = { :links => [ %(<a href="/admin/dashboard">Dashboard</a>),
+                              %(<a href="/admin/dashboard">Dashboard</a>) ] }
 
-    output = header
-    partial = "admin/helpers/header"
-    options = { :links => [ %(<a href="/admin/dashboard">Dashboard</a>),
-                            %(<a href="/admin/dashboard">Dashboard</a>) ] }
+      assert_equal [ partial, options ], output
 
-    assert_equal [ partial, options ], output
+    end
 
   end
 
-=end
+  context "display_flash_message" do
 
-  should "display_flash_message" do
-    message = { :test => "This is the message." }
-    output = display_flash_message(message)
+    should "be displayed" do
+      message = { :test => "This is the message." }
+      output = display_flash_message(message)
+      expected = ["admin/helpers/flash_message",
+                  { :flash_type => :test, :message => { :test => "This is the message." } }]
+      assert_equal expected, output
+    end
 
-    partial = "admin/helpers/flash_message"
-    options = { :flash_type => :test,
-                :message => { :test => "This is the message." } }
-
-    assert_equal partial, output.first
-    assert_equal options, output.last
-  end
+    should "not be displayed when message is empty" do
+      assert_nil display_flash_message(Hash.new)
+    end
 
-  should "not display_flash_message with empty message" do
-    assert display_flash_message(Hash.new).nil?
   end
 
 end

data/test/helpers/admin/dashboard_helper_test.rb

@@ -10,14 +10,10 @@ class Admin::DashboardHelperTest < ActiveSupport::TestCase
   def render(*args); args; end
 
   should "render resources" do
-    @current_user = Factory(:typus_user)
-
-    output = resources
-    partial = "admin/helpers/dashboard/resources"
-    options = { :resources => ["Git", "Status", "WatchDog"] }
-
-    assert_equal partial, output.first
-    assert_equal options, output.last
+    current_user = Factory(:typus_user)
+    output = resources(current_user)
+    expected = ["admin/helpers/dashboard/resources", { :resources => ["Git", "Status", "WatchDog"] }]
+    assert_equal expected, output
   end
 
 end

data/test/helpers/admin/form_helper_test.rb

@@ -5,16 +5,13 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
   include Admin::FormHelper
   include Admin::ResourcesHelper
 
-=begin
-
-  # FIXME: Problem with params number. A form option has to be sent.
-  def test_typus_belongs_to_field
+  should_eventually "verify_belongs_to_field" do
 
     params = { :controller => 'admin/post', :id => 1, :action => :create }
     self.stubs(:params).returns(params)
 
-    @current_user = mock()
-    @current_user.stubs(:can?).with('create', Post).returns(false)
+    current_user = mock()
+    current_user.stubs(:can?).with('create', Post).returns(false)
     @resource = Comment
 
     expected = <<-HTML
@@ -32,18 +29,13 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
-
-  # FIXME: Problem with the number of attributes.
-  def test_typus_belongs_to_field_with_different_attribute_name
+  should_eventually "test_typus_belongs_to_field_with_different_attribute_name" do
 
     params = { :controller => 'admin/post', :id => 1, :action => :edit }
     self.stubs(:params).returns(params)
 
-    @current_user = mock()
-    @current_user.stubs(:can?).with('create', Comment).returns(true)
+    current_user = mock()
+    current_user.stubs(:can?).with('create', Comment).returns(true)
     @resource = Post
 
     expected = <<-HTML
@@ -61,12 +53,7 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
-
-  # FIXME: Problem with the number of params.
-  def test_typus_tree_field
+  should_eventually "test_typus_tree_field" do
 
     self.stubs(:expand_tree_into_select_field).returns('expand_tree_into_select_field')
 
@@ -84,13 +71,7 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
-
-  # FIXME: Attribute disabled
-
-  should "verify attribute_disabled" do
+  should_eventually "verify_attribute_disabled" do
     @resource = Post
     assert !attribute_disabled?('test')
     Post.expects(:accessible_attributes).returns(['test'])
@@ -99,11 +80,7 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
     assert attribute_disabled?('test')
   end
 
-=end
-
-=begin
-
-  def test_expand_tree_into_select_field
+  should_eventually "test_expand_tree_into_select_field" do
 
     items = Page.roots
 
@@ -137,6 +114,4 @@ class Admin::FormHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
 end

data/test/helpers/admin/resources_helper_test.rb

@@ -9,23 +9,32 @@ class Admin::ResourcesHelperTest < ActiveSupport::TestCase
 
   def render(*args); args; end
 
-  should "verify display_link_to_previous" do
-    @resource = Post
-    params = { :action => "edit", :back_to => "/back_to_param" }
-    self.expects(:params).at_least_once.returns(params)
+  context "display_link_to_previous" do
 
-    partial = "admin/helpers/resources/display_link_to_previous"
-    options = { :message => "You're updating a Post." }
+    should "verify display_link_to_previous" do
+      @resource = Post
+      params = { :action => "edit", :back_to => "/back_to_param" }
+      self.expects(:params).at_least_once.returns(params)
 
-    assert_equal [ partial, options ], display_link_to_previous
+      expected = [ "admin/helpers/resources/display_link_to_previous", { :message => "You're updating a Post." } ]
+      output = display_link_to_previous
+
+      assert_equal expected, output
+    end
   end
 
-  should "remove_filter_link" do
-    output = remove_filter_link("")
-    assert output.nil?
+  context "remove_filter_link" do
+
+    should "return nil when blank" do
+      output = remove_filter_link("")
+      assert_nil output
+    end
+
+    should "return link when it's present"
+
   end
 
-  context "Build list" do
+  context "build_list" do
 
     setup do
       @model = TypusUser
@@ -34,17 +43,20 @@ class Admin::ResourcesHelperTest < ActiveSupport::TestCase
       @resource = "typus_users"
     end
 
-    should "verify build_list_when_returns_a_table" do
-      self.stubs(:build_table).returns("a_list_with_items")
+    should "return a table" do
+      expected = [ "admin/typus_users/list", { :items => [] } ]
       output = build_list(@model, @fields, @items, @resource)
-      assert_equal "a_list_with_items", output
+      assert_equal expected, output
     end
 
-    should "verify build_list_when_returns_a_template" do
+    should "return a template" do
       self.stubs(:render).returns("a_template")
       File.stubs(:exist?).returns(true)
+
+      expected = "a_template"
       output = build_list(@model, @fields, @items, @resource)
-      assert_equal "a_template", output
+
+      assert_equal expected, output
     end
 
   end

data/test/helpers/admin/sidebar_helper_test.rb

@@ -16,12 +16,9 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     default_url_options[:host] = 'test.host'
   end
 
-=begin
+  should "test_actions"
 
-  def test_actions
-  end
-
-  def test_export
+  should_eventually "test_export" do
     @resource = Post
 
     params = { :controller => 'admin/posts', :action => 'index' }
@@ -35,12 +32,12 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     assert_equal expected, output
   end
 
-  def test_build_typus_list_with_empty_content_and_empty_header
+  should_eventually "test_build_typus_list_with_empty_content_and_empty_header" do
     output = build_typus_list([], :header => nil)
     assert output.empty?
   end
 
-  def test_build_typus_list_with_content_and_header
+  should_eventually "test_build_typus_list_with_content_and_header" do
     output = build_typus_list(['item1', 'item2'], :header => "Chunky Bacon")
     assert !output.empty?
 
@@ -51,7 +48,7 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     assert_equal expected, output
   end
 
-  def test_build_typus_list_with_content_without_header
+  should_eventually "test_build_typus_list_with_content_without_header" do
     output = build_typus_list(['item1', 'item2'])
     expected = [ "admin/helpers/list", { :header => nil,
                                          :options => {},
@@ -59,7 +56,7 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     assert_equal expected, output
   end
 
-  def test_search
+  should_eventually "test_search" do
 
     @resource = TypusUser
 
@@ -82,23 +79,18 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
   end
 
-  def test_filters
+  should_eventually "test_filters" do
     @resource = TypusUser
     @resource.expects(:typus_filters).returns(Array.new)
     output = filters
     assert output.nil?
   end
 
-  def test_filters_with_filters
-  end
+  should "test_filters_with_filters"
 
-  def test_relationship_filter
-  end
+  should "test_relationship_filter"
 
-  def test_date_filter
-
-    # FIXME
-    return
+  should_eventually "test_date_filter" do
 
     @resource = TypusUser
     filter = 'created_at'
@@ -138,10 +130,7 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
   end
 
-  def test_boolean_filter
-
-    # FIXME
-    return
+  should_eventually "test_boolean_filter" do
 
     @resource = TypusUser
     filter = 'status'
@@ -177,7 +166,7 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
   end
 
-  def test_string_filter_when_values_are_strings
+  should_eventually "test_string_filter_when_values_are_strings" do
 
     @resource = TypusUser
     filter = 'role'
@@ -235,7 +224,7 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
   end
 
-  def test_string_filter_when_values_are_arrays_of_strings
+  should_eventually "test_string_filter_when_values_are_arrays_of_strings" do
 
     @resource = TypusUser
     filter = 'role'
@@ -272,7 +261,7 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
 
   end
 
-  def test_string_filter_when_empty_values
+  should_eventually "test_string_filter_when_empty_values" do
     @resource = TypusUser
     filter = 'role'
     request = 'role=admin&page=1'
@@ -282,6 +271,4 @@ class Admin::SidebarHelperTest < ActiveSupport::TestCase
     assert output.empty?
   end
 
-=end
-
 end

data/test/helpers/admin/table_helper_test.rb

@@ -15,12 +15,9 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     default_url_options[:host] = "test.host"
   end
 
-=begin
+  should_eventually "test_build_table" do
 
-  # FIXME
-  def test_build_table
-
-    @current_user = Factory(:typus_user)
+    current_user = Factory(:typus_user)
 
     params = { :controller => 'admin/typus_users', :action => 'index' }
     self.expects(:params).at_least_once.returns(params)
@@ -41,14 +38,10 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
+  should_eventually "test_table_header" do
 
-  def test_table_header
-
-    @current_user = mock()
-    @current_user.expects(:can?).with("delete", TypusUser).returns(true)
+    current_user = mock()
+    current_user.expects(:can?).with("delete", TypusUser).returns(true)
 
     fields = TypusUser.typus_fields_for(:list)
 
@@ -66,14 +59,10 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
+  should_eventually "test_table_header_with_params" do
 
-  def test_table_header_with_params
-
-    @current_user = mock()
-    @current_user.expects(:can?).with("delete", TypusUser).returns(true)
+    current_user = mock()
+    current_user.expects(:can?).with("delete", TypusUser).returns(true)
 
     fields = TypusUser.typus_fields_for(:list)
 
@@ -92,14 +81,10 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
-
-  def test_table_header_when_user_cannot_delete_items
+  should_eventually "test_table_header_when_user_cannot_delete_items" do
 
-    @current_user = mock()
-    @current_user.expects(:can?).with("delete", TypusUser).returns(false)
+    current_user = mock()
+    current_user.expects(:can?).with("delete", TypusUser).returns(false)
 
     fields = TypusUser.typus_fields_for(:list)
 
@@ -117,14 +102,10 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
+  should_eventually "test_table_header_when_user_cannot_delete_items_with_params" do
 
-=begin
-
-  def test_table_header_when_user_cannot_delete_items_with_params
-
-    @current_user = mock()
-    @current_user.expects(:can?).with("delete", TypusUser).returns(false)
+    current_user = mock()
+    current_user.expects(:can?).with("delete", TypusUser).returns(false)
 
     fields = TypusUser.typus_fields_for(:list)
 
@@ -141,13 +122,9 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
+  should_eventually "test_table_belongs_to_field" do
 
-  def test_table_belongs_to_field
-
-    @current_user = Factory(:typus_user)
+    current_user = Factory(:typus_user)
 
     comment = comments(:without_post_id)
     output = table_belongs_to_field("post", comment)
@@ -164,58 +141,42 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
-=begin
-
-  def test_table_has_and_belongs_to_many_field
+  should_eventually "test_table_has_and_belongs_to_many_field" do
     post = Factory(:post)
-
     output = table_has_and_belongs_to_many_field("comments", post)
     expected = %(<td>John, Me, Me</td>)
-
     assert_equal expected.strip, output
   end
 
-=end
-
-  should "test_table_string_field" do
+  should_eventually "test_table_string_field" do
     post = Factory(:post)
-
     output = table_string_field(:title, post, :created_at)
     expected = %(<td class="title">#{post.title}</td>)
-
     assert_equal expected.strip, output
   end
 
-  should "test_table_string_field_with_link" do
+  should_eventually "test_table_string_field_with_link" do
     post = Factory(:post)
-
     output = table_string_field(:title, post, :title)
     expected = %(<td class="title">#{post.title}</td>)
-
     assert_equal expected.strip, output
   end
 
-  should "table_tree_field_when_displays_a_parent" do
+  should_eventually "table_tree_field_when_displays_a_parent" do
     page = Factory(:page)
-
     output = table_tree_field("test", page)
     expected = "<td>&#151;</td>"
-
     assert_equal expected, output
   end
 
-  should "table_tree_field_when_displays_a_children" do
+  should_eventually "table_tree_field_when_displays_a_children" do
     page = Factory(:page, :status => "unpublished")
-
     output = table_tree_field("test", page)
     expected = "<td>&#151;</td>"
-
     assert_equal expected, output
   end
 
-  should "test_table_datetime_field" do
+  should_eventually "test_table_datetime_field" do
     post = Factory(:post)
     Time::DATE_FORMATS[:post_short] = "%m/%y"
 
@@ -225,7 +186,7 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     assert_equal expected.strip, output
   end
 
-  should "test_table_datetime_field_with_link" do
+  should_eventually "test_table_datetime_field_with_link" do
     post = Factory(:post)
     Time::DATE_FORMATS[:post_short] = "%m/%y"
 
@@ -235,10 +196,7 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
     assert_equal expected.strip, output
   end
 
-=begin
-
-  # FIXME: NameError: undefined local variable or method `controller' for
-  def test_table_boolean_field
+  should_eventually "test_table_boolean_field" do
 
     post = Factory(:typus_user)
     output = table_boolean_field("status", post)
@@ -258,6 +216,4 @@ class Admin::TableHelperTest < ActiveSupport::TestCase
 
   end
 
-=end
-
 end