typo 4.0.3 → 4.1

data/test/functional/theme_controller_test.rb

@@ -13,7 +13,7 @@ class ThemeControllerTest < Test::Unit::TestCase
   def test_stylesheets
     get :stylesheets, :filename => "azure.css"
     assert_response :success
-    assert_equal "text/css", @response.headers['Content-Type']
+    assert_equal "text/css; charset=utf-8", @response.headers['Content-Type']
     assert_equal "inline; filename=\"azure.css\"", @response.headers['Content-Disposition']
   end
 

data/test/functional/xml_controller_test.rb

@@ -30,7 +30,7 @@ end
 class XmlController; def rescue_action(e) raise e end; end
 
 class XmlControllerTest < Test::Unit::TestCase
-  fixtures :contents, :categories, :articles_categories, :tags,
+  fixtures :contents, :categories, :categorizations, :tags,
     :articles_tags, :users, :blogs, :resources
 
   def setup
@@ -105,7 +105,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body
 
-    assert_rss20(2)
+    assert_rss20(3)
   end
 
   def test_feed_rss20_article
@@ -171,7 +171,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(2)
+    assert_atom10(3)
 
     assert_xpath('//title[@type="html"]')
     assert_xpath('//summary', "Trackback entry has no summaries")
@@ -241,8 +241,8 @@ class XmlControllerTest < Test::Unit::TestCase
   def test_pubdate_conformance
     get :feed, :format => 'rss20', :type => 'feed'
     assert_response :success
-    xml = REXML::Document.new(@response.body)
-    assert_equal contents(:article2).created_at.rfc822, REXML::XPath.match(xml, '/rss/channel/item[title="Article 2!"]/pubDate').first.text
+
+    assert_equal contents(:article2).created_at.rfc822, get_xpath('/rss/channel/item[title="Article 2!"]/pubDate').first.text
   end
 
   def test_rsd
@@ -259,6 +259,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_match /extended content/, @response.body
 
+    @controller = XmlController.new
     set_extended_on_rss false
     get :feed, :format => 'rss20', :type => 'feed'
     assert_response :success
@@ -279,6 +280,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_not_equal 0, get_xpath(%{//summary]}).size, "Extended feed has no summaries"
     assert_not_equal 0, get_xpath(%{//content]}).size, "Extended feed has no content"
 
+    @controller = XmlController.new
     set_extended_on_rss false
     get :feed, :format => 'atom10', :type => 'feed'
     assert_response :success

data/test/mocks/themes/azure/layouts/default.rhtml

@@ -12,7 +12,7 @@
   <div id="container" class="clearfix">
       <div id="header">
         <div id="logo">
-          <h1 id="sitename"><%= link_to this_blog.blog_name, { :controller => '/' } %></h1>
+          <h1 id="sitename"><%= link_to this_blog.blog_name, this_blog.base_url %></h1>
           <h2 id="subtitle"><%= this_blog.blog_subtitle %></h2>
         </div>
       </div>
@@ -41,7 +41,7 @@
       <div id="footer">
         <ul>
           <li><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0</a></li>
-          <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=<%= server_url_for :controller => 'articles' %>">Valid CSS</a></li>
+          <li><a href="http://jigsaw.w3.org/css-validator/validator?uri=<%= this_blog.base_url %>">Valid CSS</a></li>
         </ul>
       </div>
   </div>

data/test/test_helper.rb

@@ -13,6 +13,31 @@ class Test::Unit::TestCase
   # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
   self.use_instantiated_fixtures  = false
 
+  def run(result)
+    yield(STARTED, name)
+    @_result = result
+    begin
+      CachedModel.cache_reset
+      setup
+      __send__(@method_name)
+    rescue Test::Unit::AssertionFailedError => e
+      add_failure(e.message, e.backtrace)
+    rescue StandardError, ScriptError
+      add_error($!)
+    ensure
+      begin
+        teardown
+      rescue Test::Unit::AssertionFailedError => e
+        add_failure(e.message, e.backtrace)
+      rescue StandardError, ScriptError
+        add_error($!)
+      end
+    end
+    result.add_run
+    yield(FINISHED, name)
+  end
+
+
   # Add more helper methods to be used by all tests here...
   def assert_xml(xml)
     assert_nothing_raised do
@@ -53,6 +78,56 @@ class Test::Unit::TestCase
   def this_blog
     Blog.default || Blog.create!
   end
+
+  def assert_template_has(key=nil, message=nil)
+    msg = build_message(message, "<?> is not a template object", key)
+    assert_block(msg) { @response.has_template_object?(key) }
+  end
+
+  def assert_template_has_no(key=nil, message=nil)
+    msg = build_message(message, "<?> is a template object <?>",
+                                  key,         @response.template_objects[key])
+    assert_block(msg) { !@response.has_template_object?(key) }
+  end
+
+  def assert_session_has(key=nil, message=nil)
+    msg = build_message(message, "<?> is not in the session <?>",
+                                  key,                @response.session)
+    assert_block(msg) { @response.has_session_object?(key) }
+  end
+
+  def assert_session_has_no(key=nil, message=nil)
+    msg = build_message(message, "<?> is in the session <?>",
+                                  key,         @response.session)
+    assert_block(msg) { !@response.has_session_object?(key) }
+  end
+
+  def assert_invalid_column_on_record(key = nil, columns = "", message = nil) #:nodoc:
+    record = find_record_in_template(key)
+    record.send(:validate)
+
+    cols = glue_columns(columns)
+    cols.delete_if { |col| record.errors.invalid?(col) }
+    msg = build_message(message, "Active Record has valid columns <?>)", cols.join(",") )
+    assert_block(msg) { cols.empty? }
+  end
+
+  def glue_columns(columns)
+    cols = []
+    cols << columns if columns.class == String
+    cols += columns if columns.class == Array
+    cols
+  end
+
+  def find_record_in_template(key = nil)
+    assert_not_nil assigns(key)
+    record = @response.template_objects[key]
+
+    assert_not_nil(record)
+    assert_kind_of ActiveRecord::Base, record
+
+    return record
+  end
 end
 
 # Extend HTML::Tag to understand URI matching

data/test/unit/amazon_sidebar_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AmazonSidebarTest < Test::Unit::TestCase
+  fixtures :sidebars
+
+  def test_creation
+    assert_kind_of Sidebar, AmazonSidebar.new
+  end
+
+  def test_default_title
+    assert_equal 'Cited books',     AmazonSidebar.new.title
+  end
+
+  def test_default_associate_id
+    assert_equal 'justasummary-20', AmazonSidebar.new.associate_id
+  end
+
+  def test_default_maxlinks
+    assert_equal 4,                 AmazonSidebar.new.maxlinks
+  end
+
+  def test_description
+    assert_equal "Adds sidebar links to any amazon books linked in the body of the page",
+      AmazonSidebar.description
+  end
+
+  def test_initialization_with_hash
+    sb = AmazonSidebar.new(:title => 'Books',
+                           :associate_id => 'justasummary-21',
+                           :maxlinks => 3)
+    assert sb
+    assert_equal 'Books',           sb.title
+    assert_equal 'justasummary-21', sb.associate_id
+    assert_equal 3,                 sb.maxlinks
+  end
+end

data/test/unit/article_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'http_mock'
 
 class ArticleTest < Test::Unit::TestCase
-  fixtures :blogs, :contents, :articles_tags, :tags, :resources, :categories, :articles_categories, :users, :notifications
+  fixtures :blogs, :contents, :articles_tags, :tags, :resources, :categories, :categorizations, :users, :notifications, :text_filters
 
   def setup
     @articles = []
@@ -16,6 +16,32 @@ class ArticleTest < Test::Unit::TestCase
     end
   end
 
+  def test_content_fields
+    a = Article.new
+    assert_equal [:body, :extended], a.content_fields
+  end
+
+  def test_permalink_url
+    a = contents(:article3)
+    assert_equal 'http://myblog.net/articles/2004/06/01/article-3', a.permalink_url
+  end
+
+  def test_edit_url
+    a = contents(:article3)
+    assert_equal 'http://myblog.net/admin/content/edit/3', a.edit_url
+  end
+
+  def test_delete_url
+    a = contents(:article3)
+    assert_equal 'http://myblog.net/admin/content/destroy/3', a.delete_url
+  end
+
+  def test_feed_url
+    a = contents(:article3)
+    assert_equal 'http://myblog.net/xml/atom10/article/3/feed.xml', a.feed_url(:atom10)
+    assert_equal 'http://myblog.net/xml/rss20/article/3/feed.xml', a.feed_url(:rss20)
+  end
+
   def test_blog
     a = Article.new
 
@@ -151,6 +177,7 @@ class ArticleTest < Test::Unit::TestCase
                                    :published => true)
     assert art.just_published?
     assert art.save
+    art.reload
     assert !art.just_published?
 
     art = Article.create!(:title => 'title2',
@@ -163,12 +190,12 @@ class ArticleTest < Test::Unit::TestCase
   def test_future_publishing
     assert_sets_trigger(Article.create!(:title => 'title', :body => 'body',
                                         :published => true,
-                                        :published_at => Time.now + 2.seconds))
+                                        :published_at => Time.now + 4.seconds))
   end
 
   def test_future_publishing_without_published_flag
     assert_sets_trigger Article.create!(:title => 'title', :body => 'body',
-                                        :published_at => Time.now + 2.seconds)
+                                        :published_at => Time.now + 4.seconds)
   end
 
   def test_triggers_are_dependent
@@ -182,7 +209,7 @@ class ArticleTest < Test::Unit::TestCase
   def assert_sets_trigger(art)
     assert_equal 1, Trigger.count
     assert Trigger.find(:first, :conditions => ['pending_item_id = ?', art.id])
-    sleep 2
+    sleep 4
     Trigger.fire
     art.reload
     assert art.published
@@ -261,4 +288,9 @@ class ArticleTest < Test::Unit::TestCase
     assert ! art.published?
     assert   art.withdrawn?
   end
+
+  def test_default_filter
+    a = Article.find(1)
+    assert_equal 'textile', a.default_text_filter.name
+  end
 end

data/test/unit/blog_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class BlogTest < Test::Unit::TestCase
-  fixtures :blogs, :contents
+  fixtures :blogs, :contents, :sidebars
 
   def setup
     @blog = Blog.find(:first)
@@ -31,19 +31,8 @@ class BlogTest < Test::Unit::TestCase
     end
   end
 
-  def test_find_already_published
-    assert articles = @blog.find_already_published(:articles)
-    assert_kind_of Array, articles
-    assert articles.all? { |a| a.is_a?(Article) }
-    assert_equal 7, articles.size
-
-    assert comments = @blog.find_already_published(:comments)
-    assert_kind_of Array, comments
-    assert comments.all? { |c| c.is_a?(Comment) }
-  end
-
   def test_current_theme_path
-    assert_equal Theme.themes_root + "/azure", @blog.current_theme_path
+    assert_equal Theme.themes_root + "/azure", @blog.current_theme.path
   end
 
   def test_current_theme
@@ -51,33 +40,13 @@ class BlogTest < Test::Unit::TestCase
   end
 
   def test_url_for
-    assert_equal('/articles/read/1',
+    assert_equal('http://myblog.net/articles/read/1',
                  @blog.url_for(:controller => 'articles',
                                :action     => 'read',
                                :id         => 1))
   end
 
-  def test_url_for_article
-    assert_equal('/articles/2004/06/01/article-3',
-                 @blog.url_for(contents(:article3)))
-    assert_equal('/articles/2004/06/01/article-3#foo',
-                 @blog.url_for(contents(:article3), 'foo'))
-  end
-
-  def test_url_for_page
-    assert_equal('/pages/page_one',
-                 @blog.url_for(contents(:first_page)))
-  end
-
-  def test_url_for_comment
-    comment = contents(:comment2)
-    assert_equal(@blog.url_for(comment.article, "comment-#{comment.id}"),
-                 @blog.url_for(comment))
-  end
-
-  def test_url_for_trackback
-    tb = contents(:trackback1)
-    assert_equal(@blog.url_for(tb.article, "trackback-#{tb.id}"),
-                 @blog.url_for(tb))
+  def test_blog_has_sidebars
+    assert_equal 1, @blog.sidebars.size
   end
 end

data/test/unit/cache_support_test.rb

@@ -0,0 +1,62 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CacheSupportTest < Test::Unit::TestCase
+  fixtures :blogs, :contents, :users, :text_filters
+
+  def setup
+    @article = Article.find(:first)
+  end
+
+  def test_valid_if_unchanged
+    assert !@article.invalidates_cache?
+  end
+
+  def test_invalidates_if_changed
+    @article.body = 'A change of body will smash the cache'
+    assert @article.invalidates_cache?
+  end
+
+  def test_invalid_if_publication_status_changes
+    article = contents(:article1)
+    assert ! article.invalidates_cache?
+    article.withdraw!
+    assert article.invalidates_cache?
+
+    article = contents(:article4)
+    article.publish!
+    assert article.invalidates_cache?
+
+  end
+
+  def test_valid_if_unpublished_when_destroyed
+    a = contents(:article4)
+    assert ! a.invalidates_cache?(true)
+  end
+
+  def test_invalid_if_newly_unpublished_when_destroyed
+    a = contents(:article1)
+    a.withdraw!
+    assert a.invalidates_cache?(true)
+  end
+
+  def test_invalid_if_published_when_destroyed
+    a = contents(:article1)
+    assert a.invalidates_cache?(true)
+  end
+
+  def test_invalid_if_title_changes
+    a = contents(:article1)
+
+    a.title = 'A new title'
+    assert a.invalidates_cache?
+  end
+
+  def test_valid_if_unpublished_and_altered
+    a = contents(:article4)
+
+    a.body = 'A new body in just 6 weeks'
+    assert ! a.invalidates_cache?
+  end
+end
+
+

data/test/unit/category_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class CategoryTest < Test::Unit::TestCase
-  fixtures :contents, :categories, :articles_categories
+  fixtures :contents, :categories, :categorizations, :blogs
 
   def setup
     @category = Category.find(1)
@@ -34,4 +34,9 @@ class CategoryTest < Test::Unit::TestCase
     Category.reorder_alpha
     assert_equal categories(:hardware), Category.find(:first, :order => :position)
   end
+  
+  def test_permalink
+    assert_equal 'http://myblog.net/articles/category/software', @category.permalink_url
+  end
+  
 end

data/test/unit/comment_test.rb

@@ -3,16 +3,35 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'dns_mock'
 
 class CommentTest < Test::Unit::TestCase
-  fixtures :contents, :blacklist_patterns, :text_filters, :blogs
+  fixtures :contents, :feedback, :blacklist_patterns, :text_filters, :blogs
+
+  def setup
+    CachedModel.cache_reset
+  end
+
+  def test_permalink_url
+    c = feedback(:old_comment)
+    assert_equal "http://myblog.net/articles/2004/05/01/inactive-article#comment-#{c.id}", c.permalink_url
+  end
+
+  def test_edit_url
+    c = feedback(:old_comment)
+    assert_equal "http://myblog.net/admin/comments/edit/#{c.id}", c.edit_url
+  end
+
+  def test_delete_url
+    c = feedback(:old_comment)
+    assert_equal "http://myblog.net/admin/comments/destroy/#{c.id}", c.delete_url
+  end
 
   def test_save_regular
-    assert contents(:comment2).save
-    assert_equal "http://www.google.com", contents(:comment2).url
+    assert feedback(:comment2).save
+    assert_equal "http://www.google.com", feedback(:comment2).url
   end
 
   def test_save_spam
-    assert contents(:spam_comment).save
-    assert_equal "http://fakeurl.com", contents(:spam_comment).url
+    assert feedback(:spam_comment).save
+    assert_equal "http://fakeurl.com", feedback(:spam_comment).url
   end
 
   def test_create_comment
@@ -94,8 +113,8 @@ class CommentTest < Test::Unit::TestCase
   end
 
   def test_article_relation
-    assert_equal true, contents(:comment2).has_article?
-    assert_equal 1, contents(:comment2).article.id
+    assert feedback(:comment2).article
+    assert_equal 1, feedback(:comment2).article.id
   end
 
   def test_xss_rejection
@@ -113,12 +132,12 @@ class CommentTest < Test::Unit::TestCase
       assert c.save
       assert c.errors.empty?
 
-      assert c.body_html !~ /<script>/
+      assert c.html(:body) !~ /<script>/
     end
   end
 
   def test_withdraw
-    c = Comment.find(contents(:comment2).id)
+    c = Comment.find(feedback(:comment2).id)
     assert c.withdraw!
     assert ! c.published?
     assert c.spam?
@@ -137,6 +156,7 @@ class CommentTest < Test::Unit::TestCase
     c = a.comments.build(:body => 'foo', :author => 'bob', :published => true, :published_at => Time.now)
     assert c.save
     assert c.published?
+    c.reload
     a.reload
 
     assert_equal 1, a.published_comments.size
@@ -160,4 +180,9 @@ class CommentTest < Test::Unit::TestCase
     assert_equal 2,
       a.comments.find_all_by_status_confirmed(true).size
   end
+
+  def test_default_filter
+    a = Comment.find(:first)
+    assert_equal 'markdown', a.default_text_filter.name
+  end
 end