typo 5.1.3 → 5.1.98

data/spec/models/comment_spec.rb

@@ -3,184 +3,212 @@ require File.dirname(__FILE__) + "/../spec_helper"
 require 'dns_mock'
 
 describe Comment do
+
+  def valid_comment(options={})
+    Comment.new({:author => 'Bob',
+                :article_id => contents(:article1).id,
+                :body => 'nice post',
+                :ip => '1.2.3.4'}.merge(options))
+  end
+
   before(:each) do
     CachedModel.cache_reset
   end
 
-  def test_permalink_url
-    c = feedback(:old_comment)
-    assert_equal "http://myblog.net/2004/05/01/inactive-article#comment-#{c.id}", c.permalink_url
+  describe '#permalink_url' do
+    it 'should render permalink to comment in public part' do
+      c = feedback(:old_comment)
+      assert_equal "http://myblog.net/2004/05/01/inactive-article#comment-#{c.id}", c.permalink_url
+    end
   end
 
-  def test_edit_url
-    c = feedback(:old_comment)
-    assert_equal "http://myblog.net/admin/comments/edit/#{c.id}", c.edit_url
+  describe '#edit_url' do
+    it 'should get a url where edit comment in admin' do
+      c = feedback(:old_comment)
+      assert_equal "http://myblog.net/admin/comments/edit/#{c.id}", c.edit_url
+    end
   end
 
-  def test_delete_url
-    c = feedback(:old_comment)
-    assert_equal "http://myblog.net/admin/comments/destroy/#{c.id}", c.delete_url
+  describe '#delete_url' do
+    it 'should get the delete url of comment in admin part' do
+      c = feedback(:old_comment)
+      assert_equal "http://myblog.net/admin/comments/destroy/#{c.id}", c.delete_url
+    end
   end
 
-  def test_save_regular
-    assert feedback(:comment2).save
-    assert_equal "http://www.google.com", feedback(:comment2).url
-  end
+  describe '#save' do
 
-  def test_save_spam
-    assert feedback(:spam_comment).save
-    assert_equal "http://fakeurl.com", feedback(:spam_comment).url
-  end
+    it 'should save good comment' do
+      assert feedback(:comment2).save
+      assert_equal "http://www.google.com", feedback(:comment2).url
+    end
 
-  def test_create_comment
-    c = Comment.new
-    c.author = 'Bob'
-    c.article_id = contents(:article1).id
-    c.body = 'nice post'
-    c.ip = '1.2.3.4'
+    it 'should save spam comment' do
+      assert feedback(:spam_comment).save
+      assert_equal "http://fakeurl.com", feedback(:spam_comment).url
+    end
 
-    assert c.save
-    assert c.guid.size > 15
-  end
+    it 'should not save in invalid article' do
+      c = valid_comment(:author => "Old Spammer",
+                        :body => "Old trackback body",
+                        :article => contents(:inactive_article))
 
-  def test_reject_spam_rbl
-    cmt = Comment.new do |c|
-      c.author = "Spammer"
-      c.body = %{This is just some random text. <a href="http://chinaaircatering.com">without any senses.</a>. Please disregard.}
-      c.url = "http://buy-computer.us"
-      c.ip = "212.42.230.206"
+      assert ! c.save
+      assert c.errors.invalid?('article_id')
+
+      c.article = @article1
+
+      assert c.save
+      assert c.errors.empty?
     end
-    assert cmt.spam?
-    assert !cmt.status_confirmed?
-  end
 
-  def test_not_spam_but_rbl_lookup_succeeds
-    cmt      = Comment.new do |c|
-      c.author = "Not a Spammer"
-      c.body   = "Useful commentary!"
-      c.url    = "http://www.bofh.org.uk"
-      c.ip     = "10.10.10.10"
+    it 'should change old comment' do
+      c = contents(:inactive_article).comments.first
+      c.body = 'Comment body <em>italic</em> <strong>bold</strong>'
+      assert c.save
+      assert c.errors.empty?
     end
-    assert !cmt.spam?
-    assert !cmt.status_confirmed?
-  end
 
-  def test_reject_spam_pattern
-    cmt = Comment.new do |c|
-      c.author = "Another Spammer"
-      c.body = "Texas hold-em poker crap"
-      c.url = "http://texas.hold-em.us"
+    it 'should save a valid comment' do
+      c = valid_comment # article created 2 days ago
+      c.save.should be_true
+      c.errors.should be_empty
     end
-    assert cmt.spam?
-    assert !cmt.status_confirmed?
+
+    it 'should not save with article not allow comment'  do
+      b = Blog.default
+      b.sp_article_auto_close = 1
+      b.save
+
+      c = valid_comment # article created 2 days ago
+      c.save.should_not be_true
+      c.errors.should_not be_empty
+    end
+
   end
 
-  def test_reject_spam_uri_limit
-    c = Comment.new do |c|
-      c.author = "Yet Another Spammer"
-      c.body = %{ <a href="http://www.one.com/">one</a> <a href="http://www.two.com/">two</a> <a href="http://www.three.com/">three</a> <a href="http://www.four.com/">four</a> }
-      c.url = "http://www.uri-limit.com"
-      c.ip = "123.123.123.123"
+  describe '#create' do
+
+    it 'should create comment' do
+      c = valid_comment
+      assert c.save
+      assert c.guid.size > 15
     end
 
-    assert c.spam?
-    assert !c.status_confirmed?
   end
 
-  def test_reject_article_age
-    c = Comment.new do |c|
-      c.author = "Old Spammer"
-      c.body = "Old trackback body"
-      c.article = contents(:inactive_article)
+  describe '#spam?' do
+    it 'should reject spam rbl' do
+      c = valid_comment(:author => "Spammer",
+                        :body => %{This is just some random text. &lt;a href="http://chinaaircatering.com"&gt;without any senses.&lt;/a&gt;. Please disregard.},
+                        :url => "http://buy-computer.us")
+      should_be_spam(c)
+    end
+
+    it 'should not define spam a comment rbl with lookup succeeds' do
+      c = valid_comment(:author => "Not a Spammer",
+                        :body   => "Useful commentary!",
+                        :url    => "http://www.bofh.org.uk")
+      c.should_not be_spam
+      c.should_not be_status_confirmed
     end
 
-    assert ! c.save
-    assert c.errors.invalid?('article_id')
+    it 'should reject spam pattern' do
+      c = valid_comment(:author => "Another Spammer",
+                          :body => "Texas hold-em poker crap",
+                          :url => "http://texas.hold-em.us")
+      should_be_spam(c)
+    end
 
-    c.article = @article1
+    it 'should reject spam with uri limit' do
+      c = valid_comment(:author => "Yet Another Spammer",
+                        :body => %{ <a href="http://www.one.com/">one</a> <a href="http://www.two.com/">two</a> <a href="http://www.three.com/">three</a> <a href="http://www.four.com/">four</a> },
+                        :url => "http://www.uri-limit.com")
+      should_be_spam(c)
+    end
 
-    assert c.save
-    assert c.errors.empty?
-  end
+    def should_be_spam(comment)
+      comment.should be_spam
+      comment.should_not be_status_confirmed
+    end
 
-  def test_modify_old_comment
-    c = contents(:inactive_article).comments.first
-    c.body = 'Comment body <em>italic</em> <strong>bold</strong>'
-    assert c.save
-    assert c.errors.empty?
   end
 
-  def test_article_relation
+  it 'should have good relation' do
     assert feedback(:comment2).article
     assert_equal contents(:article1), feedback(:comment2).article
   end
 
-  def test_xss_rejection
-    c = Comment.new do |c|
-      c.body = "Test foo <script>do_evil();</script>"
-      c.author = 'Bob'
-      c.article_id = contents(:article1).id
+  describe 'reject xss' do
+    before(:each) do
+      @comment = Comment.new do |c|
+        c.body = "Test foo <script>do_evil();</script>"
+        c.author = 'Bob'
+        c.article_id = contents(:article1).id
+      end
     end
-
-    # Test each filter to make sure that we don't allow scripts through.
-    # Yes, this is ugly.
     ['','textile','markdown','smartypants','markdown smartypants'].each do |filter|
-      Blog.default.comment_text_filter = filter
+      it "should reject with filter #{filter}" do
+        Blog.default.comment_text_filter = filter
 
-      assert c.save
-      assert c.errors.empty?
+        assert @comment.save
+        assert @comment.errors.empty?
 
-      assert c.html(:body) !~ /<script>/
+        assert @comment.html(:body) !~ /<script>/
+      end
     end
   end
 
-  def test_withdraw
-    c = Comment.find(feedback(:comment2).id)
-    assert c.withdraw!
-    assert ! c.published?
-    assert c.spam?
-    assert c.status_confirmed?
-    c.reload
-    assert ! c.published?
-    assert c.spam?
-    assert c.status_confirmed?
-  end
+  describe 'change state' do
+    it 'should becomes withdraw' do
+      c = Comment.find(feedback(:comment2).id)
+      assert c.withdraw!
+      assert ! c.published?
+      assert c.spam?
+      assert c.status_confirmed?
+      c.reload
+      assert ! c.published?
+      assert c.spam?
+      assert c.status_confirmed?
+    end
 
-  def test_published
-    a = Article.new(:title => 'foo')
-    assert a.save
+    it 'should becomes not published in article if withdraw' do
+      a = Article.new(:title => 'foo')
+      assert a.save
 
-    assert_equal 0, a.published_comments.size
-    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 0, a.published_comments.size
+      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
-    c.withdraw!
+      assert_equal 1, a.published_comments.size
+      c.withdraw!
 
-    a = Article.new(:title => 'foo')
-    assert_equal 0, a.published_comments.size
-  end
+      a = Article.new(:title => 'foo')
+      assert_equal 0, a.published_comments.size
+    end
 
-  def test_status_confirmed
-    a = contents(:spammed_article)
-    assert !a.comments[0].status_confirmed?
-    assert  a.comments[1].status_confirmed?
-
-    a.reload
-    assert_equal 1,
-      a.comments.find_all_by_status_confirmed(true).size
-    assert_equal 1,
-      a.comments.find_all_by_status_confirmed(true).size
-    a.comments[0].withdraw!
-    assert_equal 2,
-      a.comments.find_all_by_status_confirmed(true).size
+    it 'should becomes not confirmed in article if withdraw' do
+      a = contents(:spammed_article)
+      assert !a.comments[0].status_confirmed?
+      assert  a.comments[1].status_confirmed?
+
+      a.reload
+      assert_equal 1,
+        a.comments.find_all_by_status_confirmed(true).size
+      assert_equal 1,
+        a.comments.find_all_by_status_confirmed(true).size
+      a.comments[0].withdraw!
+      assert_equal 2,
+        a.comments.find_all_by_status_confirmed(true).size
+    end
   end
 
-  def test_default_filter
+  it 'should have good default filter' do
     a = Comment.find(:first)
     assert_equal 'markdown', a.default_text_filter.name
   end
+
 end

data/spec/models/metafragment_spec.rb

@@ -5,6 +5,13 @@ class FragmentCacheTest
   include MetaFragmentCache
   include ActionController::Caching::Fragments
 
+  @@cache_store = nil
+  cattr_reader :cache_store
+  
+  def initialize()
+    @@cache_store = ActiveSupport::Cache.lookup_store(:memory_store)
+  end
+
   def self.benchmark(foo)
     yield
   end
@@ -12,6 +19,11 @@ class FragmentCacheTest
   def perform_caching
     true
   end
+
+  def cache_configured?
+    true
+  end
+    
 end
 
 describe 'Just porting metafragment_test without necessarily understanding it' do

data/spec/models/resource_spec.rb

@@ -17,6 +17,7 @@ describe Resource, ' with its fixtures loaded' do
   it 'resources created with the same name as an existing resource don\'t overwrite the old resource' do
     File.should_receive(:exist?).with(%r{public/files/me\.jpg$}).and_return(true)
     File.should_receive(:exist?).with(%r{public/files/me1\.jpg$}).at_least(:once).and_return(false)
+    File.should_receive(:unlink).with(%r{public/files/me1\.jpg$}).and_return(true)
 
     f1 = Resource.create(:filename => resources(:resource1).filename,
                          :mime => resources(:resource1).mime)

data/spec/models/tag_spec.rb

@@ -40,10 +40,10 @@ describe 'Given loaded fixtures' do
     tags.should have(2).entries
 
     tags.first.name.should == "foo"
-    tags.first.article_counter.should == 2
+    tags.first.article_counter.should == 3
 
     tags.last.name.should == 'bar'
-    tags.last.article_counter.should == 1
+    tags.last.article_counter.should == 2
   end
 
   it 'permalink_url should be of form /tag/<name>' do

data/spec/models/theme_spec.rb

@@ -5,8 +5,8 @@ describe 'Given a new test theme' do
     @theme = Theme.new("test", "test")
   end
 
-  it 'layout path should be "../../themes/test/layouts/default"'  do
-    @theme.layout.should == "../../themes/test/layouts/default"
+  it 'layout path should be "../../themes/test/layouts/default.html.erb"'  do
+    @theme.layout.should == "../../themes/test/layouts/default.html.erb"
   end
 end
 

data/spec/models/user_spec.rb

@@ -108,3 +108,17 @@ describe 'With a user, "bob" in the database' do
     u.errors.should be_invalid('login')
   end
 end
+
+describe User do
+  describe '#admin?' do
+
+    it 'should return true if user is admin' do
+      users(:tobi).should be_admin
+    end
+
+    it 'should return false if user is not admin' do
+      users(:user_publisher).should_not be_admin
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 # from the project root directory.
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'spec'
 require 'spec/rails'
 
 Spec::Runner.configure do |config|

data/spec/views/articles/index_spec.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+# test standard view and all themes
+[ nil, "dirtylicious", "scribbish", "standard_issue", "typographic" ].each do |theme|
+  view_path = theme ? "#{RAILS_ROOT}/themes/#{theme}/views" : "" 
+  describe "#{view_path}/articles/index" do
+    before(:each) do
+      @controller.view_paths = [ "#{RAILS_ROOT}/themes/#{theme}/views" ] if theme
+      # we only want to test pagination links
+      ActionView::Base.class_eval do
+        def article_links(article)
+          ""
+        end
+        alias :category_links :article_links
+        alias :tag_links :article_links
+      end
+    end
+  
+    context "normally" do
+      before(:each) do
+        @controller.action_name = "index"
+        assigns[:articles] = Article.paginate(:all, :page => 2, :per_page => 4)
+        render "articles/index"
+      end
+    
+      it "should not have pagination link to page 2 without q param" do
+        response.should_not have_tag("a[href=?]", "/page/2")
+      end
+      
+      it "should have pagination link to page 1 without q param if on page 2" do
+        response.should have_tag("a[href=?]", "/page/1")
+      end
+    end
+    
+    # *notice
+    # this assumptions has "&", i don`t know why, but we want only to test the q= param in link and have separated this test from controller
+    context "when search" do
+      before(:each) do
+        @controller.action_name = "search"
+        params[:q]           = "body"
+        params[:page]        = 2
+        params[:action]      = 'search'
+        assigns[:articles] = Blog.default.articles_matching(params[:q], :page => 2, :per_page => 4)
+        render "articles/index"
+      end
+    
+      it "should not have pagination link to page 2 with q param" do
+        response.should_not have_tag("a[href=?]", "/search?page=2&q=body") # *notice
+      end
+      
+      it "should have pagination link to page 1 with q param if on page 2" do
+        p response.body
+        response.should have_tag("a[href=?]", "/search?page=1&q=body") # *notice
+      end    
+    end
+  end
+end

data/test/fixtures/contents.yml

@@ -175,3 +175,21 @@ spammed_article:
   published: true
   state: published
 
+publisher_article:
+  title: Article write by publisher
+  body: body
+  extended: extended content
+  created_at: 2004-06-02 20:00:03
+  updated_at: 2004-06-02 20:00:03
+  published_at: 2004-06-02 20:00:03
+  allow_comments: true
+  allow_pings: true
+  permalink: article-write-by-publisher
+  user: user_publisher
+  author: user_publisher
+  guid: a87c4220-18d4-11db-aadd-1002a5d5c51c
+  type: Article
+  published: true
+  state: published
+  tags: foo, bar
+  

data/test/fixtures/feedback.yml

@@ -11,6 +11,19 @@ spam_comment:
   guid: 12313123123123123
   state: ham
 
+comment_article2_spam:
+  type: Comment
+  published: true
+  article: article2
+  author: Bob Foo2
+  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: spam
+
 comment2:
   type: Comment
   published: true
@@ -137,3 +150,17 @@ definitely_spam_comment:
   guid: 12313123123123125
   state: spam
   status_confirmed: true
+
+comment_on_publisher_article:
+  type: Comment
+  published: true
+  article: publisher_article
+  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: 12313123123123126
+  state: ham
+  status_confirmed: true

data/test/fixtures/profiles.yml

@@ -16,6 +16,10 @@ publisher:
   nicename: Blog publisher
   modules:
   - :users
+  - :dashboard
+  - :write
+  - :content
+  - :feedback
 
 contributor:
   label: contributor

data/test/mocks/themes/typographic/views/articles/_article.html.erb

@@ -34,7 +34,7 @@
   <% else %>
 	<p class="links">
 		<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
-		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments', 'comments') %>
+		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('no comments') , _('1 comment'), __('%d comments') ),'comments', 'comments') %>
 	</p>    
   <% end %>
   <br style="clear:both;" />

data/test/mocks/themes/typographic/views/articles/index.html.erb

@@ -1,5 +1,5 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
 <% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
+<p class="pagination"><%= will_paginate @articles %></p>
 <% end -%>

data/themes/dirtylicious/layouts/default.html.erb

@@ -36,7 +36,7 @@
     	</div>
 
     	<div id="sidebar">
-      	<!-- search -->
+      	<!-- search comment this when enable live search plugin -->
       	<%= render :partial => 'shared/search' %>
 
       	<!-- sidebar components -->

data/themes/dirtylicious/views/articles/index.html.erb

@@ -1,5 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination">Older posts: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>
+<p class="pagination"><%= will_paginate @articles %></p>

data/themes/scribbish/views/articles/index.html.erb

@@ -1,5 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>
+<p class="pagination"><%= will_paginate @articles %></p>

data/themes/standard_issue/views/articles/_article.html.erb

@@ -29,7 +29,7 @@
   	</p>
 		<p class="links">
 			<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
-			<%= link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments', 'comments') %>
+			<%= link_to_permalink(article,pluralize(article.published_comments.size, _('no comments') , _('1 comment'), __('%d comments')),'comments', 'comments') %>
 		</p>
 		<% end %>
 		<br style="clear:both;" />

data/themes/standard_issue/views/articles/index.html.erb

@@ -1,5 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>
+<p class="pagination"><%= will_paginate @articles %></p>

data/themes/typographic/views/articles/_article.html.erb

@@ -34,7 +34,7 @@
   <% else %>
 	<p class="links">
 		<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
-		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments', 'comments') %>
+		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('no comments') , _('1 comment'), __('%d comments')),'comments', 'comments') %>
 	</p>    
   <% end %>
   <br style="clear: left;" />

data/themes/typographic/views/articles/index.html.erb

@@ -1,5 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>
+<%= will_paginate @articles %>