typo 4.0.3 → 4.1

data/test/fixtures/feedback.yml

@@ -0,0 +1,159 @@
+spam_comment:
+  type: Comment
+  blog_id: 1
+  id: 1
+  published: true
+  article_id: 2
+  author: Bob Foo
+  url: http://fakeurl.com
+  body: Test <a href="http://fakeurl.co.uk">body</a>
+  created_at: 2005-01-01 02:00:00
+  updated_at: 2005-01-01 02:00:00
+  published_at: 2005-01-01 02:00:00
+  guid: 12313123123123123
+  state: ContentState::Ham
+
+comment2:
+  type: Comment
+  blog_id: 1
+  id: 2
+  published: true
+  article_id: 1
+  author: John Bar
+  user_id: 2
+  url: www.google.com
+  email: john.bar@google.com
+  body: Comment body _italic_ *bold*
+  created_at: 2005-01-01 02:00:01
+  updated_at: 2005-01-01 02:00:01
+  published_at: 2005-01-01 02:00:01
+  guid: 453456456456456
+  state: ContentState::Ham
+
+comment3:
+  type: Comment
+  blog_id: 1
+  id: 3
+  published: false
+  state: ContentState::PresumedSpam
+  status_confirmed: false
+  article_id: 1
+  author: Foo Bar
+  body: Zzzzzz
+  created_at: 2005-01-01 02:00:07
+  updated_at: 2005-01-01 02:00:07
+  published_at: 2005-01-01 02:00:07
+  guid: 4534564564564567
+
+trackback1:
+  type: Trackback
+  blog_id: 1
+  id: 4
+  article_id: 2
+  published: false
+  state: ContentState::PresumedSpam
+  status_confirmed: false
+  blog_name: Trackback Blog
+  title: Trackback Entry
+  url: http://www.example.com
+  excerpt: This is an excerpt
+  created_at: 2005-01-01 03:00:00
+  updated_at: 2005-01-01 03:00:00
+  published_at: 2005-01-01 03:00:00
+  guid: dsafsadffsdsf
+
+trackback2:
+  type: Trackback
+  blog_id: 1
+  id: 5
+  article_id: 1
+  state: ContentState::PresumedHam
+  published: true
+  blog_name: Trackback Blog
+  title: Trackback Entry
+  url: http://www.example.com
+  excerpt: This is an excerpt
+  created_at: 2005-01-01 03:00:01
+  updated_at: 2005-01-01 03:00:01
+  published_at: 2005-01-01 03:00:01
+  guid: qweqweqddsfcs
+
+trackback3:
+  type: Trackback
+  blog_id: 1
+  id: 6
+  article_id: 1
+  published: true
+  state: ContentState::PresumedHam
+  blog_name: Trackback Blog 2
+  title: Trackback Entry 2
+  url: http://www.example.com
+  excerpt: This is an excerpt
+  created_at: 2005-01-01 03:00:03
+  updated_at: 2005-01-01 03:00:03
+  published_at: 2005-01-01 03:00:03
+  guid: qweqweqddsfcs3
+
+trackback4:
+  type: Trackback
+  blog_id: 1
+  id: 7
+  article_id: 17
+  published: true
+  state: ContentState::PresumedHam
+  blog_name: Trackback Blog 2
+  title: Trackback Entry 2
+  url: http://www.example.com
+  excerpt: This is an excerpt
+  created_at: 2005-01-01 03:00:04
+  updated_at: 2005-01-01 03:00:04
+  published_at: 2005-01-01 03:00:04
+  guid: qweqweqddsfcs4
+
+old_comment:
+  type: Comment
+  blog_id: 1
+  id: 8
+  article_id: 14
+  author: John Bar
+  guid: b1i2n3g4o5t6i7v
+  url: www.google.com
+  email: john.bar@google.com
+  body: Comment body _italic_ *bold*
+  created_at: 2004-05-02 20:00:02
+  updated_at: 2004-05-02 20:00:02
+  published_at: 2004-05-02 20:00:02
+  published: true
+  state: ContentState::Ham
+
+probably_spam_comment:
+  type: Comment
+  blog_id: 1
+  id: 9
+  published: false
+  article_id: 19
+  author: Bob Foo
+  url: http://fakeurl.com
+  body: Test <a href="http://fakeurl.co.uk">body</a>
+  created_at: 2005-01-01 02:00:00
+  updated_at: 2005-01-01 02:00:00
+  published_at: 2005-01-01 02:00:00
+  guid: 12313123123123124
+  state: ContentState::PresumedSpam
+  status_confirmed: false
+
+definitely_spam_comment:
+  type: Comment
+  blog_id: 1
+  id: 10
+  published: false
+  article_id: 19
+  author: Bob Foo
+  url: http://fakeurl.com
+  body: Test <a href="http://fakeurl.co.uk">body</a>
+  created_at: 2005-01-01 02:00:01
+  updated_at: 2005-01-01 02:00:01
+  published_at: 2005-01-01 02:00:01
+  guid: 12313123123123125
+  state: ContentState::Spam
+  status_confirmed: true

data/test/fixtures/sidebars.yml

@@ -1,5 +1,12 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first_sidebar:
-  id: 1
-another_sidebar:
-  id: 2
+static_sidebar:
+  id: 3
+  active_position: 1
+  staged_position: 1
+  blog_id: 1
+  config: |+
+    --- !map:HashWithIndifferentAccess
+      title: Static Sidebar
+      body: The body of a static sidebar
+
+  type: StaticSidebar

data/test/functional/accounts_controller_test.rb

@@ -24,8 +24,7 @@ class AccountsControllerTest < Test::Unit::TestCase
     assert_session_has :user
 
     assert_equal users(:bob), @response.session[:user]
-
-    assert_redirect_url "http://localhost/bogus/location"
+    assert @response.redirect_url_match?("http://localhost/bogus/location")
   end
 
   def test_signup
@@ -33,14 +32,12 @@ class AccountsControllerTest < Test::Unit::TestCase
     post :signup, :user => { :login => "newbob", :password => "newpassword", :password_confirmation => "newpassword" }
     assert_session_has :user
 
-    assert_redirect
-    assert_redirected_to :controller => "admin/general", :action => "index"
+    assert_response :redirect, :controller => "admin/general", :action => "index"
   end
 
   def test_disable_signup_after_user_exists
     get :signup
-    assert_redirect
-    assert_redirected_to :action => "login"
+    assert_response :redirect, :action => "login"
   end
 
   def test_bad_signup
@@ -50,15 +47,15 @@ class AccountsControllerTest < Test::Unit::TestCase
 
     post :signup, :user => { :login => "newbob", :password => "newpassword", :password_confirmation => "wrong" }
     assert_invalid_column_on_record "user", :password
-    assert_success
+    assert_response :success
 
     post :signup, :user => { :login => "yo", :password => "newpassword", :password_confirmation => "newpassword" }
     assert_invalid_column_on_record "user", :login
-    assert_success
+    assert_response :success
 
     post :signup, :user => { :login => "yo", :password => "newpassword", :password_confirmation => "wrong" }
     assert_invalid_column_on_record "user", [:login, :password]
-    assert_success
+    assert_response :success
   end
 
   def test_invalid_login
@@ -78,5 +75,4 @@ class AccountsControllerTest < Test::Unit::TestCase
     assert_session_has_no :user
 
   end
-
 end

data/test/functional/admin/article_preview_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 require 'admin/content_controller'
 require 'http_mock'
+require 'base64'
 
 class Admin::ContentController; def rescue_action(e) raise e end; end
 
@@ -20,21 +21,31 @@ class Admin::ArticlePreviewTest < Test::Unit::TestCase
     assert_equal @art_count, Article.find(:all).size
   end
 
+  DATA_URI_HEADER = "data:text/html;charset=utf-8;base64,"
+  def extract_data_uri
+    assert_equal DATA_URI_HEADER, @response.body[0,DATA_URI_HEADER.size]
+    data = @response.body[DATA_URI_HEADER.size..-1]
+    data = Base64.decode64(data)
+    @response.body = data
+  end
+
   def test_only_title
     post :preview, 'article' => { :title => 'A title' }
     assert_response :success
-    assert_rendered_file 'preview'
-    assert_tag :tag => 'h4', :content => 'A title'
-    assert_no_tag :tag => 'p'
+    assert_template 'preview'
+    extract_data_uri
+    assert_tag :tag => 'h2', :content => 'A title'
     assert_no_new_articles
   end
 
   def test_only_body
     post :preview, :article => { :body => 'A body' }
 
+    extract_data_uri
+
     assert_tag :tag => 'p',
       :child => 'A body',
-      :after => { :tag => 'h4', :content => nil }
+      :after => { :tag => 'h2', :content => "" }
 
     assert_no_new_articles
   end
@@ -42,9 +53,11 @@ class Admin::ArticlePreviewTest < Test::Unit::TestCase
   def test_only_extended
     post :preview, :article => { :body => 'An extension' }
 
+    extract_data_uri
+
     assert_tag :tag => 'p',
       :child => 'An extension',
-      :after => { :tag => 'h4', :content => nil }
+      :after => { :tag => 'h2', :content => "" }
 
     assert_no_new_articles
   end
@@ -54,11 +67,13 @@ class Admin::ArticlePreviewTest < Test::Unit::TestCase
       :title => 'A title', :body => 'A body',
       :extended => 'An extension' }
 
+    extract_data_uri
+
     assert_tag \
       :tag => 'p',
       :child => 'An extension',
       :after => {:tag => 'p', :child => 'A body',
-        :after => { :tag => 'h4', :content => nil }}
+        :after => { :tag => 'h2', :content => "A title" }}
 
     assert_no_new_articles
   end

data/test/functional/admin/blacklist_controller_test.rb

@@ -17,44 +17,44 @@ class Admin::BlacklistControllerTest < 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 'blacklist_patterns'
   end
 
   def test_create
-    num_blacklist_patterns = BlacklistPattern.find_all.size
+    num_blacklist_patterns = BlacklistPattern.count
 
     post :new, 'blacklist_pattern' => { }
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
 
-    assert_equal num_blacklist_patterns + 1, BlacklistPattern.find_all.size
+    assert_equal num_blacklist_patterns + 1, BlacklistPattern.count
   end
 
   def test_edit
     get :edit, 'id' => 1
-    assert_rendered_file 'edit'
-    assert_template_has 'blacklist_pattern'
-    assert_valid_record 'blacklist_pattern'
+    assert_template 'edit'
+    assert_template_has('blacklist_pattern')
+    assert_valid assigns(:blacklist_pattern)
   end
 
   def test_update
     post :edit, 'id' => 1
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
   end
 
   def test_destroy
     assert_not_nil BlacklistPattern.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) {
       blacklist_pattern = BlacklistPattern.find(1)

data/test/functional/admin/categories_controller_test.rb

@@ -17,13 +17,13 @@ class Admin::CategoriesControllerTest < Test::Unit::TestCase
 
   def test_index
     get :index
-    assert_rendered_file 'list'
+    assert_template 'list'
     assert_template_has 'categories'
   end
 
   def test_list
     get :list
-    assert_rendered_file 'list'
+    assert_template 'list'
     assert_template_has 'categories'
     assert_tag :tag => "div",
       :attributes => { :id => "category_container" }
@@ -31,41 +31,41 @@ class Admin::CategoriesControllerTest < Test::Unit::TestCase
 
   def test_show
     get :show, 'id' => 1
-    assert_rendered_file 'show'
+    assert_template 'show'
     assert_template_has 'category'
-    assert_valid_record 'category'
+    assert_valid assigns(:category)
   end
 
   def test_create
-    num_categories = Category.find_all.size
+    num_categories = Category.count
 
     post :new, 'category' => { :name => "test category" }
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
 
-    assert_equal num_categories + 1, Category.find_all.size
+    assert_equal num_categories + 1, Category.count
   end
 
   def test_edit
     get :edit, :id => 1
-    assert_rendered_file 'edit'
+    assert_template 'edit'
     assert_template_has 'category'
-    assert_valid_record 'category'
+    assert_valid assigns(:category)
   end
 
   def test_update
     post :edit, :id => 1
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
   end
 
   def test_destroy
     assert_not_nil Category.find(1)
 
     get :destroy, :id => 1
-    assert_success
-    assert_rendered_file 'destroy'
+    assert_response :success
+    assert_template 'destroy'
 
     post :destroy, :id => 1
-    assert_redirected_to :action => 'list'
+    assert_response :redirect, :action => 'list'
 
     assert_raise(ActiveRecord::RecordNotFound) { Category.find(1) }
   end

data/test/functional/admin/comments_controller_test.rb

@@ -6,7 +6,7 @@ require 'dns_mock'
 class Admin::CommentsController; def rescue_action(e) raise e end; end
 
 class Admin::CommentsControllerTest < Test::Unit::TestCase
-  fixtures :contents, :users
+  fixtures :contents, :feedback, :users, :notifications
 
   def setup
     @controller = Admin::CommentsController.new
@@ -18,61 +18,61 @@ class Admin::CommentsControllerTest < 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 'comments'
   end
 
   def test_show
-    get :show, :id => 5, :article_id => 2
-    assert_rendered_file 'show'
+    get :show, :id => feedback(:spam_comment).id, :article_id => 2
+    assert_template 'show'
     assert_template_has 'comment'
-    assert_valid_record 'comment'
+    assert_valid @response.template_objects['comment']
   end
 
   def test_new
     get :new, :article_id => 2
-    assert_rendered_file 'new'
+    assert_template 'new'
     assert_template_has 'comment'
   end
 
   def test_create
-    num_comments = Comment.find_all.size
+    num_comments = Comment.count
 
     post(:new, :comment => { 'author' => 'author', 'body' => 'body' },
                :article_id => 2)
-    assert_redirected_to :action => 'show'
+    assert_response :redirect, :action => 'show'
 
-    assert_equal num_comments + 1, Comment.find_all.size
+    assert_equal num_comments + 1, Comment.count
   end
 
   def test_edit
-    get :edit, :id => 5, :article_id => 2
-    assert_rendered_file 'edit'
+    get :edit, :id => feedback(:spam_comment).id, :article_id => 2
+    assert_template 'edit'
     assert_template_has 'comment'
-    assert_valid_record 'comment'
+    assert_valid assigns(:comment)
   end
 
   def test_update
-    post :edit, :id => 5, :article_id => 2
-    assert_redirected_to :action => 'show', :id => 5
+    post :edit, :id => feedback(:spam_comment).id, :article_id => 2
+    assert_response :redirect, :action => 'show', :id => feedback(:spam_comment).id
   end
 
   def test_destroy
-    assert_not_nil Comment.find(5)
+    assert_not_nil Comment.find(feedback(:spam_comment).id)
 
-    get :destroy, :id => 5, :article_id => 2
-    assert_success
+    get :destroy, :id => feedback(:spam_comment).id, :article_id => 2
+    assert_response :success
 
-    post :destroy, :id => 5, :article_id => 2
-    assert_redirected_to :action => 'list'
+    post :destroy, :id => feedback(:spam_comment).id, :article_id => 2
+    assert_response :redirect, :action => 'list'
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      comment = Comment.find(5)
+      comment = Comment.find(feedback(:spam_comment).id)
     }
   end
 end