typo 4.0.3 → 4.1

data/test/functional/admin/users_controller_test.rb

@@ -17,31 +17,31 @@ class Admin::UsersControllerTest < Test::Unit::TestCase
 
   def test_index
     get :index
-    assert_rendered_file 'list'
+    assert_template 'list'
     assert_template_has 'users'
   end
 
   def test_list
     get :list
-    assert_rendered_file 'list'
+    assert_template 'list'
     assert_template_has 'users'
   end
 
   def test_new
     get :new
-    assert_rendered_file 'new'
+    assert_template 'new'
 
     post :new, :user => { :login => 'errand', :email => 'corey@test.com',
       :password => 'testpass', :password_confirmation => 'testpass' }
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
     follow_redirect
-    assert_rendered_file 'list'
+    assert_template 'list'
   end
 
   def test_show
     get :show, :id => 1
-    assert_rendered_file 'show'
-    assert_valid_record 'user'
+    assert_template 'show'
+    assert_valid assigns(:user)
 
     assert_template_has 'user'
     assert_template_has 'articles'
@@ -49,27 +49,30 @@ class Admin::UsersControllerTest < Test::Unit::TestCase
 
   def test_edit
     get :edit, :id => 1
-    assert_rendered_file 'edit'
-    assert_valid_record 'user'
+    assert_template 'edit'
+    assert_valid assigns(:user)
 
     post :edit, :id => 1, :user => { :login => 'errand',
       :email => 'corey@test.com', :password => 'testpass',
       :password_confirmation => 'testpass' }
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
     follow_redirect
-    assert_rendered_file 'show'
-    assert_valid_record 'user'
+    assert_template 'show'
+    assert_valid assigns(:user)
   end
 
   def test_destroy
-    get :destroy, :id => 1
-    assert_rendered_file 'destroy'
-    assert_valid_record 'user'
+    user_count = User.count
+    get :destroy, :id => users(:bob).id
+    assert_template 'destroy'
+    assert_valid assigns(:user)
 
-    post :destroy, :id => 1
-    assert_redirected_to :action => 'list'
+    assert_equal user_count, User.count
+    post :destroy, :id => users(:bob).id
+    assert_response :redirect, :action => 'list'
     follow_redirect
-    assert_rendered_file 'list'
+    assert_template 'list'
+    assert_equal user_count - 1, User.count
   end
 
 end

data/test/functional/articles_controller_test.rb

@@ -17,7 +17,7 @@ class Content
 end
 
 class ArticlesControllerTest < Test::Unit::TestCase
-  fixtures :contents, :categories, :blogs, :users, :articles_categories, :text_filters, :articles_tags, :tags
+  fixtures :contents, :feedback, :categories, :blogs, :users, :categorizations, :text_filters, :articles_tags, :tags
   include ArticlesHelper
 
   def setup
@@ -28,7 +28,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
                     :body => "The future is cool!",
                     :keywords => "future",
                     :created_at => Time.now + 12.minutes)
-
+    Sidebar.delete_all
   end
 
   # Category subpages
@@ -36,35 +36,35 @@ class ArticlesControllerTest < Test::Unit::TestCase
     get :category, :id => "software"
 
     assert_response :success
-    assert_rendered_file "index"
-    assert_tag :tag => 'title', :content => 'test blog - category software'
+    assert_template "index"
+    assert_tag :tag => 'title', :content => 'test blog : category software'
 
     # Check it works when permalink != name. Ticket #736
     get :category, :id => "weird-permalink"
 
     assert_response :success
-    assert_rendered_file "index"
+    assert_template "index"
   end
 
   def test_empty_category
     get :category, :id => "life-on-mars"
     assert_response :success
-    assert_rendered_file "error"
+    assert_template "error"
   end
 
   def test_nonexistent_category
     get :category, :id => 'nonexistent-category'
     assert_response :success
-    assert_rendered_file "error"
+    assert_template "error"
   end
 
   def test_tag
     get :tag, :id => "foo"
 
     assert_response :success
-    assert_rendered_file "index"
+    assert_template "index"
 
-    assert_tag :tag => 'title', :content => 'test blog - tag foo'
+    assert_tag :tag => 'title', :content => 'test blog : tag foo'
     assert_tag :tag => 'h2', :content => 'Article 2!'
     assert_tag :tag => 'h2', :content => 'Article 1!'
   end
@@ -72,7 +72,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
   def test_nonexistent_tag
     get :tag, :id => "nonexistent"
     assert_response :success
-    assert_rendered_file "error"
+    assert_template "error"
   end
 
   def test_tag_routes
@@ -85,9 +85,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
     get :tag, :id => "foo"
     assert_equal 1, assigns(:articles).size
     assert_tag(:tag => 'p',
-               :attributes =>{
-                  :id => 'pagination'},
-               :content => 'Older posts: 1',
+               :attributes =>{ :id => 'pagination' },
+               :content => %r{Older posts: 1},
                :descendant => {:tag => 'a',
                                :attributes =>{
                                   :href => "/articles/tag/foo/page/2"},
@@ -98,27 +97,28 @@ class ArticlesControllerTest < Test::Unit::TestCase
   def test_index
     get :index
     assert_response :success
-    assert_rendered_file "index"
+    assert_template "index"
   end
 
   # Archives page
   def test_archives
     get :archives
     assert_response :success
-    assert_rendered_file "archives"
+    assert_template "archives"
   end
-  
+
   def test_blog_title
-    blogs(:default).title_prefix = true
+    blogs(:default).title_prefix = 1
     get :permalink, :year => 2004, :month => 06, :day => 01, :title => "article-3"
     assert_response :success
     assert_tag :tag => 'title', :content => /^test blog : Article 3!$/
-    
-    blogs(:default).title_prefix = false
+
+    blogs(:default).title_prefix = 0
+    @controller = ArticlesController.new
+    assert_equal 0, blogs(:default).title_prefix
     get :permalink, :year => 2004, :month => 06, :day => 01, :title => "article-3"
     assert_response :success
     assert_tag :tag => 'title', :content => /^Article 3!$/
-
   end
 
   # Permalinks
@@ -129,12 +129,12 @@ class ArticlesControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:article)
     assert_equal contents(:article3), assigns(:article)
   end
-  
+
   # Posts for given day
   def test_find_by_date
     get :find_by_date, :year => 2004, :month => 06, :day => 01
     assert_response :success
-    assert_rendered_file "index"
+    assert_template "index"
   end
 
   def test_comment_posting
@@ -145,18 +145,19 @@ class ArticlesControllerTest < Test::Unit::TestCase
 
     Article.find(1).notify_users << users(:tobi)
 
-    post :comment, { :id => 1, :comment => {'body' => 'This is *textile*', 'author' => 'bob' }}
+    post :comment, { :id => 1, :comment => {'body' => 'This is *markdown*', 'author' => 'bob' }}
 
     assert_response :success
-    assert_tag :tag => 'strong', :content => 'textile'
+    assert_tag :tag => 'em', :content => 'markdown'
 
     comment = Article.find(1).comments.last
     assert comment
 
     assert_not_nil cookies["author"]
 
-    assert_equal "<p>This is <strong>textile</strong></p>", comment.html(@controller).to_s
+    assert_equal "<p>This is <em>markdown</em></p>", comment.html.to_s
 
+    assert_equal 2, emails.size
     assert_equal User.find(:all,
                            :conditions => ['(notify_via_email = ?) and (notify_on_comments = ?)', true, true],
                            :order => 'email').collect { |each| each.email },
@@ -181,7 +182,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
     comment = Article.find(art_id).comments.last
     assert comment
 
-    assert_match expected_html, comment.html(@controller).to_s
+    assert_match expected_html, comment.html.to_s
     $do_breakpoints
   end
 
@@ -190,7 +191,22 @@ class ArticlesControllerTest < Test::Unit::TestCase
   end
 
   def test_comment_spam2
-    comment_template_test %r{<p>Link to <a href=["']http://spammer.example.com['"] rel=["']nofollow['"]>spammy goodness</a></p>}, 'Link to "spammy goodness":http://spammer.example.com'
+    comment_template_test %r{<p>Link to <a href=["']http://spammer.example.com['"] rel=["']nofollow['"]>spammy goodness</a></p>}, 'Link to [spammy goodness](http://spammer.example.com)'
+  end
+
+  def test_comment_spam3
+    post :comment, :id => 1, :comment => {:body => '<a href="http://spam.org">spam</a>', :author => '<a href="spamme.com">spamme</a>', :email => '<a href="http://morespam.net">foo</a>'}
+
+    assert_response :success
+    comment = Article.find(1).comments.last
+    assert comment
+
+    get :read, :id => 1
+    assert_response 200
+
+    assert ! (@response.body =~ %r{<a href="http://spamme.com">}), "Author leaks"
+    assert ! (@response.body =~ %r{<a href="http://spam.org">}), "Body leaks <a>"
+    assert ! (@response.body =~ %r{<a href="http://morespam.net">}), "Email leaks"
   end
 
   def test_comment_xss1
@@ -205,8 +221,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
   end
 
   def test_comment_autolink
-    comment_template_test "<p>What&#8217;s up with <a href=\"http://slashdot.org\" rel=\"nofollow\">http://slashdot.org</a> these days?</p>", "What's up with http://slashdot.org these days?"
-  end #"
+    comment_template_test "<p>What's up with <a href=\"http://slashdot.org\" rel=\"nofollow\">http://slashdot.org</a> these days?</p>", "What's up with http://slashdot.org these days\?"
+  end
 
   ### TODO -- there's a bug in Rails with auto_links
 #   def test_comment_autolink2
@@ -215,13 +231,13 @@ class ArticlesControllerTest < Test::Unit::TestCase
 
   def test_comment_nuking
     num_comments = Comment.count
-    post :nuke_comment, { :id => 5 }, {}
+    post :nuke_comment, { :id => feedback(:spam_comment).id }, {}
     assert_response 403
 
-    get :nuke_comment, { :id => 5 }, { :user => users(:bob)}
+    get :nuke_comment, { :id => feedback(:spam_comment).id }, { :user => users(:bob)}
     assert_response 403
 
-    post :nuke_comment, { :id => 5 }, { :user => users(:bob)}
+    post :nuke_comment, { :id => feedback(:spam_comment).id }, { :user => users(:bob)}
     assert_response :success
     assert_equal num_comments -1, Comment.count
   end
@@ -261,7 +277,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
     num_trackbacks = Article.find(2).trackbacks.count
     post :trackback, { :id => 2, :url => "http://www.google.com", :title => "My Trackback", :excerpt => "This is a test" }
     assert_response :success
-    assert_not_xpath(%{/response/error[text()="1"]}, "Error: " + get_xpath("/response/message/text()").first.to_s)
+    assert_no_tag :tag => "response",
+                  :child => {:tag => "error", :content => "1"}
 
     assert_equal num_trackbacks+1, Article.find(2).trackbacks.count
   end
@@ -285,9 +302,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
 
     get :index
 
-    assert_redirect
-    assert_redirected_to :controller => "admin/general", :action => "redirect"
-
+    assert_response :redirect,
+                    :controller => "admin/general", :action => "redirect"
   end
 
   def test_no_users_exist
@@ -297,15 +313,14 @@ class ArticlesControllerTest < Test::Unit::TestCase
     assert User.count.zero?
 
     get :index
-    assert_redirect
-    assert_redirected_to :controller => "accounts", :action => "signup"
+    assert_response :redirect, :controller => "accounts", :action => "signup"
 
   end
 
   def test_pages_static
     get :view_page, :name => 'page_one'
     assert_response :success
-    assert_rendered_file "view_page"
+    assert_template "view_page"
 
     get :view_page, :name => 'page one'
     assert_response 404
@@ -334,6 +349,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
 
     # Switch gravatar integration to on
     this_blog.use_gravatar = true
+    @controller = ArticlesController.new
     assert this_blog.use_gravatar
     get :read, :id => 1
     assert_response :success
@@ -367,7 +383,7 @@ class ArticlesControllerTest < Test::Unit::TestCase
     get :read, :id => contents(:article1).id
     assert_response :success
     assert_template "read"
-    
+
     assert_equal contents(:article1).comments.to_a.select{|c| c.published?}, contents(:article1).published_comments
 
     assert_tag :tag => "ol",
@@ -509,8 +525,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
   def test_author
     get :author, :id => 'tobi'
 
-    assert_success
-    assert_rendered_file 'index'
+    assert_response :success
+    assert_template 'index'
     assert assigns(:articles)
     assert_equal users(:tobi).articles.published, assigns(:articles)
     # This is until we write a proper author feed
@@ -521,8 +537,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
   def test_nonexistent_author
     get :author, :id => 'nonexistent-chap'
 
-    assert_success
-    assert_rendered_file 'error'
+    assert_response :success
+    assert_template 'error'
     assert assigns(:message)
     assert_equal "Can't find posts with author 'nonexistent-chap'", assigns(:message)
   end
@@ -530,8 +546,8 @@ class ArticlesControllerTest < Test::Unit::TestCase
   def test_author_list
     get :author
 
-    assert_success
-    assert_rendered_file 'groupings'
+    assert_response :success
+    assert_template 'groupings'
 
     assert_tag(:tag => 'ul',
                :descendant => {\

data/test/functional/backend_controller_test.rb

@@ -8,7 +8,7 @@ require 'base64'
 class BackendController; def rescue_action(e) raise e end; end
 
 class BackendControllerTest < Test::Unit::TestCase
-  fixtures :contents, :categories, :blogs, :users, :articles_categories, :text_filters
+  fixtures :contents, :categories, :blogs, :users, :categorizations, :text_filters
 
   def setup
     @controller = BackendController.new
@@ -46,7 +46,7 @@ class BackendControllerTest < Test::Unit::TestCase
     new_post = Article.find(result)
     assert_equal "new post title", new_post.title
     assert_equal "new post *body*", new_post.body
-    assert_equal "<p>new post <strong>body</strong></p>", new_post.html(@controller, :body)
+    assert_equal "<p>new post <strong>body</strong></p>", new_post.html(:body)
     assert_equal "textile", new_post.text_filter.name
     assert_equal users(:tobi), new_post.user
     assert_equal this_blog.id, new_post.blog_id
@@ -62,7 +62,7 @@ class BackendControllerTest < Test::Unit::TestCase
     new_post = Article.find(result)
     assert_equal "new post body for post without", new_post.title
     assert_equal "new post body for post without title but with a lenghty body", new_post.body
-    assert_equal "<p>new post body for post without title but with a lenghty body</p>", new_post.html(@controller, :body)
+    assert_equal "<p>new post body for post without title but with a lenghty body</p>", new_post.html(:body)
   end
 
   def test_blogger_new_post_with_categories
@@ -140,7 +140,7 @@ class BackendControllerTest < Test::Unit::TestCase
 
     assert_equal article.title, new_article.title
     assert_equal article.body, new_article.body
-    assert_equal "<p>this is a <strong>test</strong></p>", new_article.html(@controller, :body)
+    assert_equal "<p>this is a <strong>test</strong></p>", new_article.html(:body)
     assert_equal Time.now.midnight.to_s, new_article.published_at.to_s
     assert_equal this_blog.id, new_article.blog_id
   end
@@ -162,9 +162,9 @@ class BackendControllerTest < Test::Unit::TestCase
     assert_equal "Posted via Test", new_post.title
     assert_equal "textile", new_post.text_filter.name
     assert_equal article.body, new_post.body
-    assert_equal "<p>body</p>", new_post.html(@controller, :body)
+    assert_equal "<p>body</p>", new_post.html(:body)
     assert_equal article.extended, new_post.extended
-    assert_equal "<p>extend me</p>", new_post.html(@controller, :extended)
+    assert_equal "<p>extend me</p>", new_post.html(:extended)
     assert_equal Time.now.midnight.to_s, new_post.published_at.to_s
     assert_equal this_blog.id, new_post.blog_id
   end

data/test/functional/redirect_controller_test.rb

@@ -19,18 +19,18 @@ class RedirectControllerTest < Test::Unit::TestCase
   def test_redirect
     get :redirect, :from => "foo/bar"
     assert_response 301
-    assert_redirected_to "/someplace/else"
+    assert_response :redirect, "/someplace/else"
   end
 
   def test_url_root_redirect
     @request.relative_url_root = "/blog"
     get :redirect, :from => "foo/bar"
     assert_response 301
-    assert_redirected_to "/blog/someplace/else"
+    assert_response :redirect, "/blog/someplace/else"
     
     get :redirect, :from => "bar/foo"
     assert_response 301
-    assert_redirected_to "/blog/someplace/else"
+    assert_response :redirect, "/blog/someplace/else"
   end
 
   def test_no_redirect

data/test/functional/textfilter_controller_test.rb

@@ -8,7 +8,7 @@ class TextfilterController; def rescue_action(e) raise e end; end
 class ActionController::Base; def rescue_action(e) raise e end; end
 
 class TextfilterControllerTest < Test::Unit::TestCase
-  fixtures :text_filters
+  fixtures :text_filters, :blogs
 
   def setup
     @controller = TextfilterController.new
@@ -23,9 +23,13 @@ class TextfilterControllerTest < Test::Unit::TestCase
 
 #    @controller.initialize_current_url #rescue nil
   end
+  
+  def blog
+    blogs(:default)
+  end
 
-  def filter_text(text, filters, filterparams={}, filter_html=false)
-    TextFilter.filter_text(text, @controller, self, filters, filterparams, filter_html)
+  def filter_text(text, filters, filterparams={})
+    TextFilter.filter_text(blog, text, self, filters, filterparams)
   end
 
   def whiteboard
@@ -68,12 +72,6 @@ class TextfilterControllerTest < Test::Unit::TestCase
 
     assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
       filter_text('*"foo"*',[:doesntexist1,:markdown,"doesn't exist 2",:smartypants,:nopenotmeeither])
-
-    assert_equal '<p>foo</p>',
-      filter_text('<p>foo</p>',[],{},false)
-
-    assert_equal '&lt;p&gt;foo&lt;/p&gt;',
-      filter_text('<p>foo</p>',[],{},true)
   end
 
   def test_amazon
@@ -200,7 +198,7 @@ end
 
   def test_named_filter
     assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
-      TextFilter.filter_text_by_name('*"foo"*', @controller, 'markdown smartypants')
+      TextFilter.filter_text_by_name(blog, '*"foo"*', 'markdown smartypants')
   end
 
   def test_code_plus_markup_chain
@@ -244,8 +242,8 @@ EOF
 \t<p><em>footer text here</em></p>
 EOF
 
-    assert_equal expects_markdown.strip, TextFilter.filter_text_by_name(text, @controller, 'markdown')
-    assert_equal expects_textile.strip, TextFilter.filter_text_by_name(text, @controller, 'textile')
+    assert_equal expects_markdown.strip, TextFilter.filter_text_by_name(blog, text, 'markdown')
+    assert_equal expects_textile.strip, TextFilter.filter_text_by_name(blog, text, 'textile')
   end
 
   def test_lightbox