typo 4.0.3 → 4.1

data/test/functional/admin/content_controller_test.rb

@@ -7,8 +7,8 @@ require 'http_mock'
 class Admin::ContentController; def rescue_action(e) raise e end; end
 
 class Admin::ContentControllerTest < Test::Unit::TestCase
-  fixtures :contents, :users, :categories, :resources, :text_filters,
-           :blogs, :articles_categories
+  fixtures :contents, :feedback, :users, :categories, :resources, :text_filters,
+           :blogs, :categorizations
 
   def setup
     @controller = Admin::ContentController.new
@@ -19,20 +19,20 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
 
   def test_index
     get :index
-    assert_rendered_file 'list'
+    assert_template 'list'
   end
 
   def test_list
     get :list
-    assert_rendered_file 'list'
+    assert_template 'list'
     assert_template_has 'articles'
   end
 
   def test_show
     get :show, 'id' => 1
-    assert_rendered_file 'show'
+    assert_template 'show'
     assert_template_has 'article'
-    assert_valid_record 'article'
+    assert_valid assigns(:article)
     assert_not_nil assigns(:article)
     assert_not_nil assigns(:categories)
     assert_not_nil assigns(:resources)
@@ -40,7 +40,7 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
 
   def test_new
     get :new
-    assert_rendered_file 'new'
+    assert_template 'new'
     assert_template_has 'article'
   end
 
@@ -70,7 +70,7 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
     emails.clear
     tags = ['foo', 'bar', 'baz bliz', 'gorp gack gar']
     post :new, 'article' => { :title => "posted via tests!", :body => "Foo", :keywords => "foo bar 'baz bliz' \"gorp gack gar\""}, 'categories' => [1]
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
 
     assert_equal num_articles + 1, this_blog.published_articles.size
 
@@ -90,7 +90,7 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
          :article => { :title => "News from the future!",
                        :body => "The future's cool!",
                        :published_at => Time.now + 1.hour })
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
     assert ! assigns(:article).published?
     assert_equal num_articles, this_blog.published_articles.size
     assert_equal 1, Trigger.count
@@ -111,22 +111,22 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
     body = "body via *textile*"
     extended="*foo*"
     post :new, 'article' => { :title => "another test", :body => body, :extended => extended}
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
 
     new_article = Article.find(:first, :order => "created_at DESC")
     assert_equal body, new_article.body
     assert_equal extended, new_article.extended
     assert_equal "textile", new_article.text_filter.name
-    assert_equal "<p>body via <strong>textile</strong></p>", new_article.html(@controller, :body)
-    assert_equal "<p><strong>foo</strong></p>", new_article.html(@controller, :extended)
+    assert_equal "<p>body via <strong>textile</strong></p>", new_article.html(:body)
+    assert_equal "<p><strong>foo</strong></p>", new_article.html(:extended)
   end
 
   def test_edit
     get :edit, 'id' => 1
     assert_equal assigns(:selected), Article.find(1).categories.collect {|c| c.id}
-    assert_rendered_file 'edit'
+    assert_template 'edit'
     assert_template_has 'article'
-    assert_valid_record 'article'
+    assert_valid assigns(:article)
   end
 
   def test_update
@@ -135,14 +135,11 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
 
     body = "another *textile* test"
     post :edit, 'id' => 1, 'article' => {:body => body, :text_filter => 'textile'}
-    assert_redirected_to :action => 'show', :id => 1
+    assert_response :redirect, :action => 'show', :id => 1
 
     article = Article.find(1)
     assert_equal "textile", article.text_filter.name
     assert_equal body, article.body
-    # Deliberately *not* using the mediating protocol, we want to ensure that the
-    # body_html got reset to nil.
-    assert_nil article.body_html
 
     assert_equal 0, emails.size
   end
@@ -151,10 +148,10 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
     assert_not_nil Article.find(1)
 
     get :destroy, 'id' => 1
-    assert_success
+    assert_response :success
 
     post :destroy, 'id' => 1
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
 
     assert_raise(ActiveRecord::RecordNotFound) {
       article = Article.find(1)
@@ -164,9 +161,9 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
   def test_category_add
     get :category_add, :id => 1, :category_id => 1
 
-    assert_rendered_file '_show_categories'
-    assert_valid_record 'article'
-    assert_valid_record 'category'
+    assert_template '_show_categories'
+    assert_valid assigns(:article)
+    assert_valid assigns(:category)
     assert Article.find(1).categories.include?(Category.find(1))
     assert_not_nil assigns(:article)
     assert_not_nil assigns(:category)
@@ -176,9 +173,9 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
   def test_category_remove
     get :category_remove, :id => 1, :category_id => 1
 
-    assert_rendered_file '_show_categories'
-    assert_valid_record 'article'
-    assert_valid_record 'category'
+    assert_template '_show_categories'
+    assert_valid assigns(:article)
+    assert_valid assigns(:category)
     assert !Article.find(1).categories.include?(Category.find(1))
     assert_not_nil assigns(:article)
     assert_not_nil assigns(:category)
@@ -188,9 +185,9 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
   def test_resource_add
     get :resource_add, :id => 1, :resource_id => 1
 
-    assert_rendered_file '_show_resources'
-    assert_valid_record 'article'
-    assert_valid_record 'resource'
+    assert_template '_show_resources'
+    assert_valid assigns(:article)
+    assert_valid assigns(:resource)
     assert Article.find(1).resources.include?(Resource.find(1))
     assert_not_nil assigns(:article)
     assert_not_nil assigns(:resource)
@@ -200,9 +197,9 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
   def test_resource_remove
     get :resource_remove, :id => 1, :resource_id => 1
 
-    assert_rendered_file '_show_resources'
-    assert_valid_record 'article'
-    assert_valid_record 'resource'
+    assert_template '_show_resources'
+    assert_valid assigns(:article)
+    assert_valid assigns(:resource)
     assert !Article.find(1).resources.include?(Resource.find(1))
     assert_not_nil assigns(:article)
     assert_not_nil assigns(:resource)
@@ -211,15 +208,10 @@ class Admin::ContentControllerTest < Test::Unit::TestCase
 
   def test_attachment_box_add
     get :attachment_box_add, :id => 2
-    assert_rendered_file '_attachment'
+    assert_template '_attachment'
     #assert_tag :tag => 'script'
   end
 
-  def test_attachment_box_remove
-    get :attachment_box_remove, :id => 1
-    assert_tag :tag => 'script', :attributes => {:type => 'text/javascript'}
-  end
-
   def test_resource_container
     get :show, :id => contents(:article1).id # article without attachments
     Resource.find(:all).each do |resource|

data/test/functional/admin/feedback_controller_test.rb

@@ -8,7 +8,7 @@ class Admin::FeedbackController; def rescue_action(e) raise e end; end
 
 class Admin::FeedbackControllerTest < Test::Unit::TestCase
   fixtures :contents, :users, :resources, :text_filters,
-           :blogs, :articles_categories
+           :blogs, :categorizations, :feedback
 
   def setup
     @controller = Admin::FeedbackController.new
@@ -20,18 +20,18 @@ class Admin::FeedbackControllerTest < Test::Unit::TestCase
   def test_index
     get :index
 
-    assert_success
-    assert_rendered_file 'list'
+    assert_response :success
+    assert_template 'list'
     assert_equal Feedback.count, assigns(:feedback).size
   end
 
   def test_list_unconfirmed
     get :index, :confirmed => 'f'
 
-    assert_success
-    assert_rendered_file 'list'
+    assert_response :success
+    assert_template 'list'
 
-    assert_equal(Feedback.count(['blog_id = 1 AND status_confirmed = ?', false]),
+    assert_equal(Feedback.count(:conditions => ['blog_id = 1 AND status_confirmed = ?', false]),
                  assigns(:feedback).size)
 
   end
@@ -39,20 +39,20 @@ class Admin::FeedbackControllerTest < Test::Unit::TestCase
   def test_list_spam
     get :index, :published => 'f'
 
-    assert_success
-    assert_rendered_file 'list'
+    assert_response :success
+    assert_template 'list'
 
-    assert_equal(Feedback.count(['blog_id = 1 AND published = ?', false]),
+    assert_equal(Feedback.count(:conditions => ['blog_id = 1 AND published = ?', false]),
                  assigns(:feedback).size)
   end
 
   def test_list_unconfirmed_spam
     get :index, :published => 'f', :confirmed => 'f'
 
-    assert_success
-    assert_rendered_file 'list'
+    assert_response :success
+    assert_template 'list'
 
-    assert_equal(Feedback.count(['blog_id = 1 AND published = ? AND status_confirmed = ?', false, false]),
+    assert_equal(Feedback.count(:conditions => ['blog_id = 1 AND published = ? AND status_confirmed = ?', false, false]),
                  assigns(:feedback).size)
   end
 

data/test/functional/admin/general_controller_test.rb

@@ -16,11 +16,11 @@ class Admin::GeneralControllerTest < Test::Unit::TestCase
 
   def test_index
     get :index
-    assert_rendered_file 'index'
+    assert_template 'index'
   end
 
   def test_redirect
     get :redirect
-    assert_redirected_to :controller => 'admin/general', :action => 'index'
+    assert_response :redirect, :controller => 'admin/general', :action => 'index'
   end
 end

data/test/functional/admin/pages_controller_test.rb

@@ -57,7 +57,7 @@ class Admin::PagesControllerTest < Test::Unit::TestCase
 
     assert_equal "new_page", new_page.name
 
-    assert_redirected_to :action => "show", :id => new_page.id
+    assert_response :redirect, :action => "show", :id => new_page.id
 
     # XXX: The flash is currently being made available improperly to tests (scoop)
     #assert_equal "Page was successfully created.", flash[:notice]
@@ -74,10 +74,7 @@ class Admin::PagesControllerTest < Test::Unit::TestCase
     post :edit, :id => contents(:markdown_page).id, :page => { :name => "markdown-page", :title => "Markdown Page",
         :body => "Adding a [link](http://www.typosphere.org/) here" }
 
-
-    assert_equal "", contents(:markdown_page).reload.body_html.to_s
-
-    assert_redirected_to :action => "show", :id => contents(:markdown_page).id
+    assert_response :redirect, :action => "show", :id => contents(:markdown_page).id
 
     # XXX: The flash is currently being made available improperly to tests (scoop)
     #assert_equal "Page was successfully updated.", flash[:notice]
@@ -85,19 +82,7 @@ class Admin::PagesControllerTest < Test::Unit::TestCase
 
   def test_destroy
     post :destroy, :id => contents(:another_page).id
-    assert_redirected_to :action => "list"
+    assert_response :redirect, :action => "list"
     assert_raise(ActiveRecord::RecordNotFound) { Page.find(contents(:another_page).id) }
   end
-
-  def test_preview
-    get :preview, :page => { :name => "preview-page", :title => "Preview Page",
-      :text_filter_id => text_filters(:markdown_filter).id,
-      :body => "testing the *preview*" }
-    assert_response :success
-    assert_not_nil assigns(:page)
-    assert_template "preview"
-
-    assert_dom_equal "<div><p>testing the <em>preview</em></p></div>\n",
-                     @response.body
-  end
 end

data/test/functional/admin/resources_controller_test.rb

@@ -16,8 +16,8 @@ class Admin::ResourcesControllerTest < Test::Unit::TestCase
 
   def test_list
     get :list
-    assert_success
-    assert_rendered_file 'list'
+    assert_response :success
+    assert_template 'list'
     assert_template_has 'resources'
     assert_not_nil assigns(:resources)
     assert_not_nil assigns(:resources_pages)
@@ -27,20 +27,20 @@ class Admin::ResourcesControllerTest < Test::Unit::TestCase
     assert_not_nil Resource.find(1)
 
     get :destroy, :id => 1
-    assert_success
-    assert_rendered_file 'destroy'
+    assert_response :success
+    assert_template 'destroy'
     assert_not_nil assigns(:file)
 
     post :destroy, :id => 1
     assert_response 302
     follow_redirect
-    assert_rendered_file 'list'
+    assert_template 'list'
   end
 
   def test_new
     get :new
-    assert_success
-    assert_rendered_file 'new'
+    assert_response :success
+    assert_template 'new'
   end
 
   def test_upload

data/test/functional/admin/textfilters_controller_test.rb

@@ -18,12 +18,12 @@ class Admin::TextfiltersControllerTest < Test::Unit::TestCase
   def test_new_without_filters
     post :new, :textfilter => { :name => 'filterx',
       :description => 'Filter X', :markup => 'markdown' }
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
   end
 
   def test_edit_without_filters
     post :edit, :id => 1, :textfilter => { :name => 'filterx',
       :description => 'Filter X', :markup => 'markdown' }
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
   end
 end

data/test/functional/admin/themes_controller_test.rb

@@ -24,7 +24,7 @@ class Admin::ThemesControllerTest < Test::Unit::TestCase
 
   def test_switchto
     get :switchto, :theme => 'azure'
-    assert_redirected_to :action => 'index'
+    assert_response :redirect, :action => 'index'
   end
 
   def test_preview

data/test/functional/admin/trackbacks_controller_test.rb

@@ -5,7 +5,7 @@ require 'admin/trackbacks_controller'
 class Admin::TrackbacksController; def rescue_action(e) raise e end; end
 
 class Admin::TrackbacksControllerTest < Test::Unit::TestCase
-  fixtures :contents, :users
+  fixtures :contents, :feedback, :users
 
   def setup
     @controller = Admin::TrackbacksController.new
@@ -17,60 +17,60 @@ class Admin::TrackbacksControllerTest < Test::Unit::TestCase
 
   def test_index
     get :index, :article_id => 2
-    assert_rendered_file 'list'
+    assert_template 'list'
   end
 
   def test_list
     get :list, :article_id => 2
-    assert_rendered_file 'list'
+    assert_template 'list'
     assert_template_has 'trackbacks'
   end
 
   def test_show
-    get :show, :id => 7, :article_id => 2
-    assert_rendered_file 'show'
+    get :show, :id => feedback(:trackback1).id, :article_id => 2
+    assert_template 'show'
     assert_template_has 'trackback'
-    assert_valid_record 'trackback'
+    assert_valid assigns(:trackback)
   end
 
   def test_new
     get :new, :article_id => 2
-    assert_rendered_file 'new'
+    assert_template 'new'
     assert_template_has 'trackback'
   end
 
   def test_create
-    num_trackbacks = Trackback.find_all.size
+    num_trackbacks = Trackback.count
 
     post :new, :trackback => { 'title' => 'title', 'excerpt' => 'excerpt', 'blog_name' => 'blog_name', 'url' => 'url' }, :article_id => 2
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
 
-    assert_equal num_trackbacks + 1, Trackback.find_all.size
+    assert_equal num_trackbacks + 1, Trackback.count
   end
 
   def test_edit
-    get :edit, :id => 7, :article_id => 2
-    assert_rendered_file 'edit'
+    get :edit, :id => feedback(:trackback1).id, :article_id => 2
+    assert_template 'edit'
     assert_template_has 'trackback'
-    assert_valid_record 'trackback'
+    assert_valid assigns(:trackback)
   end
 
   def test_update
-    post :edit, :id => 7, :article_id => 2
-    assert_redirected_to :action => 'show', :id => 7
+    post :edit, :id => feedback(:trackback1).id, :article_id => 2
+    assert_response :redirect, :action => 'show', :id => feedback(:trackback1).id
   end
 
   def test_destroy
-    assert_not_nil Trackback.find(7)
+    assert_not_nil Trackback.find(feedback(:trackback1).id)
 
-    get :destroy, :id => 7, :article_id => 2
-    assert_success
+    get :destroy, :id => feedback(:trackback1).id, :article_id => 2
+    assert_response :success
 
-    post :destroy, :id => 7, :article_id => 2
-    assert_redirected_to :action => 'list'
+    post :destroy, :id => feedback(:trackback1).id, :article_id => 2
+    assert_response :redirect, :action => 'list'
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      trackback = Trackback.find(7)
+      trackback = Trackback.find(feedback(:trackback1).id)
     }
   end
 end