typo 5.2 → 5.2.98

data/spec/controllers/redirect_controller_spec.rb

@@ -10,19 +10,35 @@ describe RedirectController do
     ActionController::Base.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
   end
 
-  def test_routing_splits_path
+  it 'should split routing path' do
     assert_routing "foo/bar/baz", {
       :from => ["foo", "bar", "baz"],
       :controller => 'redirect', :action => 'redirect'}
   end
 
-  def test_redirect
+  it 'should redirect from articles_routing' do
+    assert_routing "articles", {
+      :from => ["articles"],
+      :controller => 'redirect', :action => 'redirect'}
+    assert_routing "articles/foo", {
+      :from => ["articles", "foo"],
+      :controller => 'redirect', :action => 'redirect'}
+    assert_routing "articles/foo/bar", {
+      :from => ["articles", "foo", "bar"],
+      :controller => 'redirect', :action => 'redirect'}
+    assert_routing "articles/foo/bar/baz", {
+      :from => ["articles", "foo", "bar", "baz"],
+      :controller => 'redirect', :action => 'redirect'}
+  end
+
+
+  it 'should redirect' do
     get :redirect, :from => ["foo", "bar"]
     assert_response 301
     assert_redirected_to "http://test.host/someplace/else"
   end
 
-  def test_url_root_redirect
+  it 'should redirect with url_root' do
     ActionController::Base.relative_url_root = "/blog"
     get :redirect, :from => ["foo", "bar"]
     assert_response 301
@@ -33,41 +49,116 @@ describe RedirectController do
     assert_redirected_to "http://test.host/blog/someplace/else"
   end
 
-  def test_no_redirect
+  it 'should no redirect' do
     get :redirect, :from => ["something/that/isnt/there"]
     assert_response 404
   end
 
-  def test_redirect_articles
-    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+  it 'should redirect to article' do
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
     assert_response 301
-    assert_redirected_to "http://test.host/foo/bar/baz"
+    assert_redirected_to "http://myblog.net/2004/04/01/second-blog-article"
   end
 
-  def test_redirect_articles_with_articles_in_path
-    get :redirect, :from => ["articles", "foo", "articles", "baz"]
+  it 'should redirect to article with url_root' do
+    b = blogs(:default)
+    b.base_url = "http://test.host/blog"
+    b.save
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
     assert_response 301
-    assert_redirected_to "http://test.host/foo/articles/baz"
+    assert_redirected_to "http://test.host/blog/2004/04/01/second-blog-article"
   end
 
-  def test_url_root_redirect_articles
-    ActionController::Base.relative_url_root = "/blog"
-    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+  it 'should redirect to article when url_root is articles' do
+    b = blogs(:default)
+    b.base_url = "http://test.host/articles"
+    b.save
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
     assert_response 301
-    assert_redirected_to "http://test.host/blog/foo/bar/baz"
+    assert_redirected_to "http://test.host/articles/2004/04/01/second-blog-article"
   end
 
-  def test_url_root_redirect_articles_when_url_root_is_articles
-    ActionController::Base.relative_url_root = "/articles"
-    get :redirect, :from => ["articles", "foo", "bar", "baz"]
+  it 'should redirect to article with articles in url_root' do
+    b = blogs(:default)
+    b.base_url = "http://test.host/aaa/articles/bbb"
+    b.save
+
+    get :redirect, :from => ["articles", "2004", "04", "01", "second-blog-article"]
     assert_response 301
-    assert_redirected_to "http://test.host/articles/foo/bar/baz"
+    assert_redirected_to "http://test.host/aaa/articles/bbb/2004/04/01/second-blog-article"
   end
 
-  def test_url_root_redirect_articles_with_articles_in_url_root
-    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"
+  describe 'render article' do
+
+    integrate_views
+
+    before(:each) do
+      b = blogs(:default)
+      b.permalink_format = '/%title%.html'
+      b.save
+      get :redirect, :from => ["#{contents(:article1).permalink}.html"]
+    end
+
+    it 'should render template read to article' do
+      response.should render_template('articles/read.html.erb')
+    end
+
+    it 'should have good rss feed' do
+      response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.rss")
+    end
+
+    it 'should have good atom feed' do
+      response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.atom")
+    end
+
+  end
+
+  describe 'with permalink_format like %title%.html' do
+    before(:each) do
+      b = blogs(:default)
+      b.permalink_format = '/%title%.html'
+      b.save
+    end
+    describe 'render article' do
+
+      integrate_views
+
+      before(:each) do
+        get :redirect, :from => ["#{contents(:article1).permalink}.html"]
+      end
+
+      it 'should render template read to article' do
+        response.should render_template('articles/read.html.erb')
+      end
+
+      it 'should have good rss feed' do
+        response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.rss")
+      end
+
+      it 'should have good atom feed' do
+        response.should have_tag('head>link[href=?]', "http://myblog.net/#{contents(:article1).permalink}.html.atom")
+      end
+
+    end
+
+    describe 'render atom feed' do
+      before(:each) do
+        get :redirect, :from => ["#{contents(:article1).permalink}.html.atom"]
+      end
+
+      it 'should render atom partial' do
+        response.should render_template('/articles/_atom_feed')
+      end
+    end
+
+    describe 'render rss feed' do
+      before(:each) do
+        get :redirect, :from => ["#{contents(:article1).permalink}.html.rss"]
+      end
+
+      it 'should render atom partial' do
+        response.should render_template('/articles/_rss20_feed')
+      end
+    end
   end
 end

data/spec/controllers/routes/xml_routing_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe XmlController do
+  describe "route generation" do
+    it "should map #itunes" do
+      route_for(:controller => "xml", :action => "itunes").should == "/xml/itunes/feed.xml"
+    end
+    
+    it "should map #articlerss" do
+      route_for(:controller => "xml", :action => "articlerss", :id => "1").should == "/xml/articlerss/1/feed.xml"
+    end
+    
+    it "should map #commentrss" do
+      route_for(:controller => "xml", :action => "commentrss").should == "/xml/commentrss/feed.xml"
+    end
+    
+    it "should map #trackbackrss" do
+      route_for(:controller => "xml", :action => "trackbackrss").should == "/xml/trackbackrss/feed.xml"
+    end
+    
+    it "should map #feed" do
+      route_for(:controller => "xml", :action => "feed", :type => "feed", :format => "atom").should == "/xml/atom/feed.xml"
+    end
+    
+    it "should map #feed with a custom type" do
+      route_for(:controller => "xml", :action => "feed", :format => "atom", :type => "comments").should == "/xml/atom/comments/feed.xml"
+    end
+    
+    it "should map #feed with a custom type and an id" do
+      route_for(:controller => "xml", :action => "feed", :format => "atom", :type => "comments", :id => "1").should == "/xml/atom/comments/1/feed.xml"
+    end
+    
+    it "should map #feed with rss type" do
+      route_for(:controller => "xml", :action => "feed", :type => "feed", :format => "rss").should == "/xml/rss"
+    end
+    
+    it "should map #feed with sitemap type" do
+      route_for(:controller => "xml", :action => "feed", :type => "sitemap", :format => "googlesitemap").should == "/sitemap.xml"
+    end
+  end
+
+  describe "route recognition" do
+    it "should generate params for #itunes" do
+      params_from(:get, "/xml/itunes/feed.xml").should == {:controller => "xml", :action => "itunes"}
+    end
+    
+    it "should generate params for #articlerss" do
+      params_from(:get, "/xml/articlerss/1/feed.xml").should == {:controller => "xml", :action => "articlerss", :id => "1"}
+    end
+    
+    it "should generate params for #commentrss" do
+      params_from(:get, "/xml/commentrss/feed.xml").should == {:controller => "xml", :action => "commentrss"}
+    end
+    
+    it "should generate params for #trackbackrss" do
+      params_from(:get, "/xml/trackbackrss/feed.xml").should == {:controller => "xml", :action => "trackbackrss"}
+    end
+    
+    it "should generate params for #feed" do
+      params_from(:get, "/xml/atom/feed.xml").should == {:controller => "xml", :action => "feed", :type => "feed", :format => "atom"}
+    end
+    
+    it "should generate params for #feed with a custom type" do
+      params_from(:get, "/xml/atom/comments/feed.xml").should == {:controller => "xml", :action => "feed", :format => "atom", :type => "comments"}
+    end
+    
+    it "should generate params for #feed with a custom type and an id" do
+      params_from(:get, "/xml/atom/comments/1/feed.xml").should == {:controller => "xml", :action => "feed", :format => "atom", :type => "comments", :id => "1"}
+    end
+    
+    it "should generate params for #feed with rss type" do
+      params_from(:get, "/xml/rss").should == {:controller => "xml", :action => "feed", :type => "feed", :format => "rss"}
+    end
+    
+    it "should generate params for #feed with sitemap type" do
+      params_from(:get, "/sitemap.xml").should == {:controller => "xml", :action => "feed", :type => "sitemap", :format => "googlesitemap"}
+    end
+  end
+end

data/spec/controllers/tags_controller_spec.rb

@@ -107,6 +107,23 @@ describe TagsController, '/articles/tag/foo' do
   end
 end
 
+describe TagsController, 'with integrate_view' do
+  integrate_views
+
+  before(:each) do
+    get 'show', :id => 'foo'
+  end
+
+  it 'should have good rss feed link in head' do
+    response.should have_tag('head>link[href=?]','http://test.host/tag/foo.rss')
+  end
+
+  it 'should have good atom feed link in head' do
+    response.should have_tag('head>link[href=?]','http://test.host/tag/foo.atom')
+  end
+
+end
+
 ## Old tests that still need conversion
 
 #   def test_autodiscovery_tag

data/spec/controllers/xml_controller_spec.rb

@@ -112,7 +112,7 @@ describe XmlController do
 
   def test_feed_rss20_article
     get :feed, :format => 'rss20', :type => 'article', :id => contents(:article1).id
-    assert_moved_permanently_to formatted_article_url(contents(:article1), :rss)
+    assert_moved_permanently_to contents(:article1).permalink_by_format(:rss)
   end
 
   def test_feed_rss20_category
@@ -161,7 +161,7 @@ describe XmlController do
 
   def test_feed_atom10_article
     get :feed, :format => 'atom10', :type => 'article', :id => contents(:article1).id
-    assert_moved_permanently_to formatted_article_url(contents(:article1), 'atom')
+    assert_moved_permanently_to contents(:article1).permalink_by_format('atom')
   end
 
   def test_feed_atom10_category

data/spec/factories.rb

@@ -0,0 +1,26 @@
+require 'factory_girl'
+
+Factory.define :user do |u|
+  u.login 'shingara'
+  u.email 'cyril.mougel@gmail.com'
+end
+
+Factory.define :article do |a|
+  a.title 'A big article'
+  a.body 'A content with several data'
+  a.permalink 'a-big-article'
+  a.published_at Time.now
+  a.user Factory.build(:user)
+end
+
+Factory.define :second_article, :parent => :article do |a|
+  a.title 'Another big article'
+  a.published_at Time.now - 2.seconds
+end
+
+Factory.define :article_with_accent_in_html, :parent => :article do |a|
+  a.title 'article with accent'
+  a.body 'écoute The future is cool!'
+  a.permalink 'article-with-accent'
+  a.published_at Time.now - 2.seconds
+end

data/spec/models/article_spec.rb

@@ -18,8 +18,7 @@ describe Article do
   end
 
   def test_permalink_url
-    a = contents(:article3)
-    assert_equal 'http://myblog.net/2004/06/01/article-3', a.permalink_url
+    assert_equal 'http://myblog.net/2004/06/01/article-3', contents(:article3).permalink_url(anchor=nil, only_path=true)
   end
 
   def test_edit_url
@@ -34,8 +33,8 @@ describe Article do
 
   def test_feed_url
     a = contents(:article3)
-    assert_equal "http://myblog.net/xml/atom10/article/#{a.id}/feed.xml", a.feed_url(:atom10)
-    assert_equal "http://myblog.net/xml/rss20/article/#{a.id}/feed.xml", a.feed_url(:rss20)
+    assert_equal "http://myblog.net/2004/06/01/article-3.atom", a.feed_url(:atom10)
+    assert_equal "http://myblog.net/2004/06/01/article-3.rss", a.feed_url(:rss20)
   end
 
   def test_create
@@ -52,17 +51,11 @@ describe Article do
     assert_equal 1, b.categories.size
   end
 
-  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) ) # not works the 2 January of each years \o/
-  end
-
   def test_permalink_with_title
     assert_equal( contents(:article3),
-                  Article.find_by_permalink(2004, 06, 01, "article-3") )
+                  Article.find_by_permalink({:year => 2004, :month => 06, :day => 01, :title => "article-3"}) )
     assert_raises(ActiveRecord::RecordNotFound) do
-      Article.find_by_permalink(2005, 06, 01, "article-5")
+      Article.find_by_permalink :year => 2005, :month => "06", :day => "01", :title => "article-5"
     end
   end
 
@@ -89,6 +82,14 @@ describe Article do
     assert_equal 'this-is-a-test', a.permalink
   end
 
+  def test_multibyte_title
+    a = Article.new
+    a.title = "ルビー"
+    assert a.save
+
+    assert_equal '%E3%83%AB%E3%83%93%E3%83%BC', a.permalink
+  end
+
   def test_urls
     urls = contents(:article4).html_urls
     assert_equal ["http://www.example.com/public"], urls
@@ -155,7 +156,7 @@ describe Article do
     @articles = Article.find_published
     assert_results_are(:search_target, :article1, :article2,
                        :article3, :inactive_article,:xmltest,
-                       :spammed_article, :publisher_article )
+                       :spammed_article, :publisher_article, :markdown_article)
 
     @articles = Article.find_published(:all,
                                                   :conditions => "title = 'Article 1!'")
@@ -201,7 +202,11 @@ describe Article do
   def assert_sets_trigger(art)
     assert_equal 1, Trigger.count
     assert Trigger.find(:first, :conditions => ['pending_item_id = ?', art.id])
-    sleep 4
+    assert !art.published
+    t = Time.now
+    # We stub the Time.now answer to emulate a sleep of 4. Avoid the sleep. So
+    # speed up in test
+    Time.stub!(:now).and_return(t + 5.seconds)
     Trigger.fire
     art.reload
     assert art.published
@@ -249,30 +254,6 @@ describe Article do
     assert contents(:article3).tags.include?(Tag.find_by_name("new"))
   end
 
-  # this also tests time_delta, indirectly
-  def test_find_all_by_date
-    feb28 = Article.new(:published => true)
-    mar1  = Article.new(:published => true)
-    mar2  = Article.new(:published => true)
-
-    feb28.title = "February 28"
-    mar1.title  = "March 1"
-    mar2.title  = "March 2"
-
-    feb28.created_at = feb28.published_at = "2004-02-28"
-    mar1.created_at  = mar1.published_at = "2004-03-01"
-    mar2.created_at  = mar2.published_at = "2004-03-02"
-
-    [feb28, mar1, mar2].each do |x|
-      x.state = :published
-      x.save
-    end
-
-    assert_equal(1, Article.find_all_by_date(2004,02).size)
-    assert_equal(2, Article.find_all_by_date(2004,03).size)
-    assert_equal(1, Article.find_all_by_date(2004,03,01).size)
-  end
-
   def test_withdrawal
     art = Article.find(contents(:article1).id)
     assert   art.published?
@@ -359,4 +340,17 @@ describe Article do
     end
   end
 
+  def test_can_ping_fresh_article_iff_it_allows_pings
+    a = Article.find(contents(:article1).id)
+    assert_equal(false, a.pings_closed?)
+    a.allow_pings = false
+    assert_equal(true, a.pings_closed?)
+  end
+
+  def test_cannot_ping_old_article
+    a = Article.find(contents(:article3).id)
+    assert_equal(true, a.pings_closed?)
+    a.allow_pings = false
+    assert_equal(true, a.pings_closed?)
+  end
 end