typo 5.1.3 → 5.1.98

data/spec/controllers/comments_controller_spec.rb

@@ -48,6 +48,7 @@ describe "All Requests", :shared => true do
 
     Comment.stub!(:find).and_return(@comment)
     Blog.stub!(:find).and_return(@blog)
+    Blog.stub!(:default).and_return(@blog)
   end
 end
 
@@ -181,9 +182,9 @@ describe CommentsController, 'GET /comments' do
   end
 
   it "should not bother fetching any comments " do
-    mock_comments = mock('comments')
-    @the_mock.should_not_receive(:published_comments)
-    @the_mock.should_not_receive(:rss_limit_params)
+    mock_comment = mock(Comment)
+    mock_comment.should_not_receive(:published_comments)
+    mock_comment.should_not_receive(:rss_limit_params)
 
     get 'index'
   end

data/spec/controllers/redirect_controller_spec.rb

@@ -7,7 +7,7 @@ class RedirectController; def rescue_action(e) raise e end; end
 
 describe RedirectController do
   before do
-    request.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
+    ActionController::Base.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
   end
 
   def test_routing_splits_path
@@ -23,7 +23,7 @@ describe RedirectController do
   end
 
   def test_url_root_redirect
-    @request.relative_url_root = "/blog"
+    ActionController::Base.relative_url_root = "/blog"
     get :redirect, :from => ["foo", "bar"]
     assert_response 301
     assert_redirected_to "http://test.host/blog/someplace/else"
@@ -51,21 +51,21 @@ describe RedirectController do
   end
 
   def test_url_root_redirect_articles
-    @request.relative_url_root = "/blog"
+    ActionController::Base.relative_url_root = "/blog"
     get :redirect, :from => ["articles", "foo", "bar", "baz"]
     assert_response 301
     assert_redirected_to "http://test.host/blog/foo/bar/baz"
   end
 
   def test_url_root_redirect_articles_when_url_root_is_articles
-    @request.relative_url_root = "/articles"
+    ActionController::Base.relative_url_root = "/articles"
     get :redirect, :from => ["articles", "foo", "bar", "baz"]
     assert_response 301
     assert_redirected_to "http://test.host/articles/foo/bar/baz"
   end
 
   def test_url_root_redirect_articles_with_articles_in_url_root
-    @request.relative_url_root = "/aaa/articles/bbb"
+    ActionController::Base.relative_url_root = "/aaa/articles/bbb"
     get :redirect, :from => ["articles", "foo", "bar", "baz"]
     assert_response 301
     assert_redirected_to "http://test.host/aaa/articles/bbb/foo/bar/baz"

data/spec/controllers/routes/articles_routing_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe ArticlesController do
+  describe "route generation" do
+    it "should map #index" do
+      route_for(:controller => "articles", :action => "index").should == "/"
+    end
+    
+    it "should map #index with rss format" do
+      route_for(:controller => "articles", :action => "index", :format => "rss").should == "/articles.rss"
+    end
+    
+    it "should map #index with atom format" do
+      route_for(:controller => "articles", :action => "index", :format => "atom").should == "/articles.atom"
+    end
+  end
+
+  describe "route recognition" do
+    it "should generate params for #index" do
+      params_from(:get, "/").should == {:controller => "articles", :action => "index"}
+    end
+    
+    it "should generate params for #index with rss format" do
+      params_from(:get, "/articles.rss").should == {:controller => "articles", :action => "index", :format => "rss"}
+    end
+    
+    it "should generate params for #index with atom format" do
+      params_from(:get, "/articles.atom").should == {:controller => "articles", :action => "index", :format => "atom"}
+    end
+  end
+end

data/spec/controllers/tags_controller_spec.rb

@@ -45,9 +45,6 @@ describe TagsController, '/articles/tag/foo' do
     Tag.stub!(:find_by_permalink) \
       .and_return(@tag)
 
-    ActionController::Pagination::Paginator.stub!(:new) \
-      .and_return(mock('pages', :null_object => true))
-
     controller.stub!(:template_exists?) \
       .and_return(true)
     this_blog = Blog.default
@@ -90,13 +87,13 @@ describe TagsController, '/articles/tag/foo' do
   end
 
   it 'should render an error when the tag is empty' do
-    @tag.should_receive(:published_articles) \
+    @tag.should_receive(:articles) \
       .and_return([])
 
     do_get
 
-    response.should render_template('articles/error')
-    assigns[:message].should == "Can't find any articles for 'foo'"
+    response.status.should == "301 Moved Permanently"
+    response.should redirect_to(Blog.default.base_url)
   end
 
   it 'should render the atom feed for /articles/tag/foo.atom' do

data/spec/controllers/textfilter_controller_spec.rb

@@ -136,19 +136,27 @@ describe TextfilterController do
     assert_response :error
   end
 
-  def test_code
-    assert_equal %{<div class="typocode"><pre><code class="typocode_default "><notextile>foo-code</notextile></code></pre></div>},
-      filter_text('<typo:code>foo-code</typo:code>',[:macropre,:macropost])
+  describe 'code textfilter' do
+    
+    describe 'single line' do
 
-    assert_equal %{<div class="typocode"><pre><code class="typocode_ruby "><notextile><span class="ident">foo</span><span class="punct">-</span><span class="ident">code</span></notextile></code></pre></div>},
-      filter_text('<typo:code lang="ruby">foo-code</typo:code>',[:macropre,:macropost])
+      it 'should made nothin if no args' do
+        filter_text('<typo:code>foo-code</typo:code>', [:macropre,:macropost]).should == %{<div class="CodeRay"><pre><notextile>foo-code</notextile></pre></div>}
+      end
 
-    assert_equal %{<div class="typocode"><pre><code class="typocode_ruby "><notextile><span class="ident">foo</span><span class="punct">-</span><span class="ident">code</span></notextile></code></pre></div> blah blah <div class="typocode"><pre><code class="typocode_xml "><notextile>zzz</notextile></code></pre></div>},
-      filter_text('<typo:code lang="ruby">foo-code</typo:code> blah blah <typo:code lang="xml">zzz</typo:code>',[:macropre,:macropost])
-  end
+      it 'should parse ruby lang' do
+        filter_text('<typo:code lang="ruby">foo-code</typo:code>', [:macropre,:macropost]).should == %{<div class="CodeRay"><pre><notextile><span class=\"CodeRay\">foo-code</span></notextile></pre></div>}
+      end
+
+      it 'should parse ruby and xml in same sentence but not in same place' do
+        filter_text('<typo:code lang="ruby">foo-code</typo:code> blah blah <typo:code lang="xml">zzz</typo:code>',[:macropre,:macropost]).should == %{<div class="CodeRay"><pre><notextile><span class="CodeRay">foo-code</span></notextile></pre></div> blah blah <div class="CodeRay"><pre><notextile><span class="CodeRay">zzz</span></notextile></pre></div>}
+      end
+
+    end
+
+    describe 'multiline' do
 
-  def test_code_multiline
-    assert_equal %{\n<div class="typocode"><pre><code class="typocode_ruby "><notextile><span class="keyword">class </span><span class="class">Foo</span>\n  <span class="keyword">def </span><span class="method">bar</span>\n    <span class="attribute">@a</span> <span class="punct">=</span> <span class="punct">&quot;</span><span class="string">zzz</span><span class="punct">&quot;</span>\n  <span class="keyword">end</span>\n<span class="keyword">end</span></notextile></code></pre></div>\n},
+      it 'should render ruby' do
       filter_text(%{
 <typo:code lang="ruby">
 class Foo
@@ -157,7 +165,15 @@ class Foo
   end
 end
 </typo:code>
-},[:macropre,:macropost])
+},[:macropre,:macropost]).should == %{
+<div class=\"CodeRay\"><pre><notextile><span class=\"CodeRay\"><span class=\"r\">class</span> <span class=\"cl\">Foo</span>
+  <span class=\"r\">def</span> <span class=\"fu\">bar</span>
+    <span class=\"iv\">@a</span> = <span class=\"s\"><span class=\"dl\">&quot;</span><span class=\"k\">zzz</span><span class=\"dl\">&quot;</span></span>
+  <span class=\"r\">end</span>
+<span class=\"r\">end</span></span></notextile></pre></div>
+}
+      end
+    end
   end
 
   def test_named_filter
@@ -184,11 +200,11 @@ EOF
     expects_markdown = <<-EOF
 <p><em>header text here</em></p>
 
-<div class="typocode"><pre><code class="typocode_ruby "><span class="keyword">class </span><span class="class">test</span>
-  <span class="keyword">def </span><span class="method">method</span>
-    <span class="punct">&quot;</span><span class="string">foo</span><span class="punct">&quot;</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></code></pre></div>
+<div class="CodeRay"><pre><span class="CodeRay"><span class="r">class</span> <span class="cl">test</span>
+  <span class="r">def</span> <span class="fu">method</span>
+    <span class="s"><span class="dl">&quot;</span><span class="k">foo</span><span class="dl">&quot;</span></span>
+  <span class="r">end</span>
+<span class="r">end</span></span></pre></div>
 
 <p><em>footer text here</em></p>
 EOF
@@ -197,11 +213,11 @@ EOF
 <p><strong>header text here</strong></p>
 
 
-<div class="typocode"><pre><code class="typocode_ruby "><span class="keyword">class </span><span class="class">test</span>
-  <span class="keyword">def </span><span class="method">method</span>
-    <span class="punct">&quot;</span><span class="string">foo</span><span class="punct">&quot;</span>
-  <span class="keyword">end</span>
-<span class="keyword">end</span></code></pre></div>
+<div class="CodeRay"><pre><span class="CodeRay"><span class="r">class</span> <span class="cl">test</span>
+  <span class="r">def</span> <span class="fu">method</span>
+    <span class="s"><span class="dl">&quot;</span><span class="k">foo</span><span class="dl">&quot;</span></span>
+  <span class="r">end</span>
+<span class="r">end</span></span></pre></div>
 
 \t<p><em>footer text here</em></p>
 EOF

data/spec/controllers/xml_controller_spec.rb

@@ -46,7 +46,10 @@ describe XmlController do
   end
 
   def assert_feedvalidator(rss, todo=nil)
-    return unless $validator_installed
+    unless $validator_installed
+      puts 'not test of validating feed because no validator (feedvalidator in python) installed'
+      return
+    end
 
     begin
       file = Tempfile.new('typo-feed-test')

data/spec/helpers/application_helper_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ApplicationHelper do
+
+  helper_name 'application'
+  
+  describe '#render_flash' do
+    it 'should render empty string if no flash' do
+      render_flash.should == ''
+    end
+
+    it 'should render a good render if only one notice' do
+      flash[:notice] = 'good update'
+      render_flash.should == '<span class="notice">good update</span>'
+    end
+
+    it 'should render the notice and error flash' do
+      flash[:notice] = 'good update'
+      flash[:error] = "it's not good"
+      render_flash.split("<br />\n").sort.should == ['<span class="error">it\'s not good</span>','<span class="notice">good update</span>']
+
+    end
+
+  end
+end

data/spec/helpers/content_helper_spec.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe ContentHelper, 'calc_distributed_class' do
+  include ContentHelper
+
   it 'should behave as specified in the old test_calc_distributed_class_basic ' do
     calc_distributed_class(0, 0, "prefix", 5, 15).should == 'prefix5'
 

data/spec/lib/text_filter_plugin_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe TextFilterPlugin::Macro do
+
+  describe "#self.attributes_parse" do
+    it 'should parse lang="ruby" to {"lang" => "ruby"}' do
+      TextFilterPlugin::Macro.attributes_parse('<typo:code lang="ruby">').should == {'lang' => 'ruby'}
+    end
+
+    it "should parse lang='ruby' to {'lang' => 'ruby'}" do
+      TextFilterPlugin::Macro.attributes_parse("<typo:code lang='ruby'>").should == {'lang' => 'ruby'}
+    end
+  end
+
+end

data/spec/models/article_closing_spec.rb

@@ -9,6 +9,10 @@ describe "CommentClosing from Test::Unit; no I don't know why it's in article_cl
     @blog = blogs(:default)
     @blog.sp_article_auto_close = 0
     @blog.default_allow_comments = true
+
+    # Blog.default may have already cached a copy of the default blog, and
+    # it won't see our changes.  So override the caching.
+    Blog.stub!(:default).and_return(@blog)
   end
 
   def test_new_article_should_be_open_if_auto_close_is_zero

data/spec/models/article_spec.rb

@@ -55,7 +55,7 @@ describe Article do
   def test_permalink
     assert_equal( contents(:article3), Article.find_by_date(2004,06,01) )
     assert_equal( [contents(:article2), contents(:article1)],
-                  Article.find_all_by_date(2.days.ago.year) )
+                  Article.find_all_by_date(2.days.ago.year) ) # not works the 2 January of each years \o/
   end
 
   def test_permalink_with_title
@@ -147,7 +147,7 @@ describe Article do
   def test_find_published_by_tag_name
     @articles = Tag.find_by_name(tags(:foo).name).published_articles
 
-    assert_results_are(:article1, :article2)
+    assert_results_are(:article1, :article2, :publisher_article)
   end
 
 
@@ -155,7 +155,7 @@ describe Article do
     @articles = Article.find_published
     assert_results_are(:search_target, :article1, :article2,
                        :article3, :inactive_article,:xmltest,
-                       :spammed_article)
+                       :spammed_article, :publisher_article )
 
     @articles = Article.find_published(:all,
                                                   :conditions => "title = 'Article 1!'")
@@ -290,4 +290,73 @@ describe Article do
     assert_equal 'textile', a.default_text_filter.name
   end
 
+  it 'should get only ham not spam comment' do
+    contents(:article2).comments.ham.should == [feedback(:spam_comment)]
+    contents(:article2).comments.count.should == 2
+  end
+
+  describe '#access_by?' do
+
+    it 'admin should be access to an article write by another' do
+      contents(:article2).should be_access_by(users(:tobi))
+    end
+
+    it 'admin should be access to an article write by himself' do
+      contents(:article1).should be_access_by(users(:tobi))
+    end
+
+  end
+
+  describe 'body_and_extended' do
+    before :each do 
+      @article = contents(:article1)
+    end
+
+    it 'should combine body and extended content' do
+      @article.body_and_extended.should ==
+        "#{@article.body}\n<!--more-->\n#{@article.extended}"
+    end
+
+    it 'should not insert <!--more--> tags if extended is empty' do
+      @article.extended = ''
+      @article.body_and_extended.should == @article.body
+    end
+  end
+
+  describe 'body_and_extended=' do
+    before :each do 
+      @article = contents(:article1)
+    end
+
+    it 'should split apart values at <!--more-->' do
+      @article.body_and_extended = 'foo<!--more-->bar'
+      @article.body.should == 'foo'
+      @article.extended.should == 'bar'
+    end
+    
+    it 'should remove newlines around <!--more-->' do
+      @article.body_and_extended = "foo\n<!--more-->\nbar"
+      @article.body.should == 'foo'
+      @article.extended.should == 'bar'
+    end
+
+    it 'should make extended empty if no <!--more--> tag' do
+      @article.body_and_extended = "foo"
+      @article.body.should == 'foo'
+      @article.extended.should be_empty
+    end
+
+    it 'should preserve extra <!--more--> tags' do
+      @article.body_and_extended = "foo<!--more-->bar<!--more-->baz"
+      @article.body.should == 'foo'
+      @article.extended.should == 'bar<!--more-->baz'
+    end
+
+    it 'should be settable via self.attributes=' do
+      @article.attributes = { :body_and_extended => 'foo<!--more-->bar' }
+      @article.body.should == 'foo'
+      @article.extended.should == 'bar'
+    end
+  end
+
 end

data/spec/models/blog_spec.rb

@@ -25,6 +25,18 @@ describe "Given the first Blog fixture" do
   end
 end
 
+describe "The default blog" do
+  it "should pick up updates after a cache clear" do
+    a = Blog.default
+    CachedModel.cache_reset
+    b = blogs(:default)
+    b.blog_name = "some other name"
+    c = Blog.default
+    c.blog_name.should == "some other name"
+  end
+end
+
+
 describe "Given no blogs" do
   before(:each)  { Blog.destroy_all }