typo 5.4.4 → 5.5

data/spec/controllers/comments_controller_spec.rb

@@ -1,137 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "All Requests", :shared => true do
-  before do
-    @comment  = mock_model(Comment,
-                  :save                       => true,
-                  :author                     => 'bob',
-                  :email                      => 'bob@home',
-                  :url                        => 'http://bobs.home/')
-    @article  = contents(:article1)
-    @blog     = blogs(:default)
-  end
-end
-
-describe "General Comment Creation", :shared => true do
-  it_should_behave_like "All Requests"
-
-  it "should assign the new comment to @comment" do
-    make_the_request
-    assigns[:comment].should == Comment.find_by_author_and_body_and_article_id('bob', 'content', contents(:article1).id)
-  end
-
-  it "should assign the article to @article" do
-    make_the_request
-    assigns[:article].should == @article
-  end
-
-  it "should save the comment" do
-    lambda do
-      make_the_request
-    end.should change(Comment, :count).by(1)
-  end
-
-  it "should set the author" do
-    make_the_request
-    contents(:article1).comments.last.author.should == 'bob'
-  end
-
-  it "should set an author cookie" do
-    make_the_request
-    cookies["author"].should == 'bob'
-  end
-
-  it "should set a gravatar_id cookie" do
-    make_the_request(:body => 'content', :author => 'bob',
-                     :email => 'bob@home', :url => 'http://bobs.home/')
-    cookies["gravatar_id"].should == Digest::MD5.hexdigest('bob@home')
-  end
-
-  it "should set a url cookie" do
-    make_the_request(:body => 'content', :author => 'bob',
-                     :email => 'bob@home', :url => 'http://bobs.home/')
-    cookies["url"].should == 'http://bobs.home/'
-  end
-
-  it "should create a comment" do
-    make_the_request
-  end
-
-end
-
-describe CommentsController, 'create' do
-  it_should_behave_like "General Comment Creation"
-
-  def make_the_request(comment = {:body => 'content', :author => 'bob'})
-    post :create, :comment => comment, :article_id => contents(:article1).id
-  end
-
-  it "should redirect to the article" do
-    make_the_request
-    response.should redirect_to("#{blogs(:default).base_url}/#{contents(:article1).created_at.year}/#{sprintf("%.2d", contents(:article1).created_at.month)}/#{sprintf("%.2d", contents(:article1).created_at.day)}/#{contents(:article1).permalink}")
-  end
-end
-
-describe CommentsController, 'AJAX creation' do
-  it_should_behave_like "General Comment Creation"
-
-  def make_the_request(comment = {:body => 'content', :author => 'bob'})
-    xhr :post, :create, :comment => comment, :article_id => contents(:article1).id
-  end
-
-  it "should render the comment partial" do
-    make_the_request
-    response.should render_template("/articles/_comment")
-  end
-end
-
-describe CommentsController, 'scoped index' do
-  it_should_behave_like "All Requests"
-
-  it "GET 2007/10/11/slug/comments should redirect to /2007/10/11/slug#comments" do
-    #content(:article1) => Time.now - 2 days
-    get 'index', :article_id => @article.id
-    response.should redirect_to("#{blogs(:default).base_url}/#{contents(:article1).created_at.year}/#{sprintf("%.2d", contents(:article1).created_at.month)}/#{sprintf("%.2d", contents(:article1).created_at.day)}/#{contents(:article1).permalink}#comments")
-  end
-
-  it "GET /2007/10/11/slug/comments.atom should return an atom feed" do
-    get :index, :format => 'atom', :article_id => contents(:article1).id
-    response.should be_success
-    response.should render_template("articles/_atom_feed")
-  end
-
-  it "GET /2007/10/11/slug/comments.rss should return an rss feed" do
-    get :index, :format => 'rss', :article_id => contents(:article1).id
-    response.should be_success
-    response.should render_template("articles/_rss20_feed")
-  end
-end
-
-describe CommentsController, 'GET /comments' do
-  it "should be successful" do
-    get 'index'
-    response.should be_success
-  end
-
-  it "should not bother fetching any comments " do
-    mock_comment = mock(Comment)
-    mock_comment.should_not_receive(:published_comments)
-    mock_comment.should_not_receive(:rss_limit_params)
-
-    get 'index'
-  end
-end
-
-describe CommentsController, "GET /comments.:format" do
-  it ":format => 'atom' should return an atom feed" do
-    get 'index', :format => 'atom'
-    response.should be_success
-    response.should render_template("articles/_atom_feed")
-  end
-
-  it ":format => 'rss' should return an rss feed"do
-    get 'index', :format => 'rss'
-    response.should be_success
-    response.should render_template("articles/_rss20_feed")
-  end
-end

data/spec/controllers/routes/articles_routing_spec.rb

@@ -1,31 +0,0 @@
-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/routes/xml_routing_spec.rb

@@ -1,71 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe XmlController do
-  describe "route generation" do
-    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 #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/setup_controller_spec.rb

@@ -1,24 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe 'GET setup with no configured blog' do
-  controller_name :setup
-
-  before(:each) do
-    Blog.delete_all
-    @blog = Blog.new.save
-  end
-
-  it 'renders index' do
-    get 'index'
-    response.should render_template('index')
-  end
-end
-
-describe 'GET setup with a configured blog and some users' do
-  controller_name :setup
-
-  it 'redirects to login' do
-    get 'index'
-    response.should redirect_to(:controller => 'articles', :action => 'index')
-  end
-end

data/spec/controllers/tags_controller_spec.rb

@@ -1,147 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe TagsController, "/index" do
-  before(:each) do
-    Tag.stub!(:find_all_with_article_counters) \
-      .and_return(mock('tags', :null_object => true))
-
-    this_blog = Blog.default
-    controller.stub!(:this_blog) \
-      .and_return(this_blog)
-  end
-
-  def do_get
-    get 'index'
-  end
-
-  it "should be successful" do
-    do_get
-    response.should be_success
-  end
-
-  it "should render :index"
-  if false
-    controller.stub!(:template_exists?) \
-      .and_return(true)
-
-    do_get
-    response.should render_template(:index)
-  end
-
-  it "should fall back to articles/groupings" do
-    controller.should_receive(:template_exists?) \
-      .with() \
-      .and_return(false)
-    do_get
-    response.should render_template('articles/groupings')
-  end
-end
-
-describe TagsController, '/articles/tag/foo' do
-  before(:each) do
-    @tag = mock('tag', :null_object => true)
-    @tag.stub!(:empty?) \
-      .and_return(false)
-    @tag.stub!(:name).and_return('foo')
-
-    Tag.stub!(:find_by_permalink) \
-      .and_return(@tag)
-
-    this_blog = Blog.default
-    controller.stub!(:this_blog) \
-      .and_return(this_blog)
-  end
-
-  def do_get
-    get 'show', :id => 'foo'
-  end
-
-  it 'should be successful' do
-    do_get()
-    response.should be_success
-  end
-
-  it 'should call Tag.find_by_permalink' do
-    Tag.should_receive(:find_by_permalink) \
-      .with('foo') \
-      .and_raise(ActiveRecord::RecordNotFound)
-    lambda do
-      do_get
-    end.should raise_error(ActiveRecord::RecordNotFound)
-  end
-
-  it 'should render :show by default'
-  if false
-    controller.stub!(:template_exists?) \
-      .and_return(true)
-    do_get
-    response.should render_template(:show)
-  end
-
-  it 'should fall back to rendering articles/index' do
-    controller.should_receive(:template_exists?) \
-      .with() \
-      .and_return(false)
-    do_get
-    response.should render_template('articles/index')
-  end
-
-  it 'should set the page title to "Tag foo"' do
-    do_get
-    assigns[:page_title].should == 'Tag foo, everything about foo'
-  end
-
-  it 'should render an error when the tag is empty' do
-    @tag.should_receive(:articles) \
-      .and_return([])
-
-    do_get
-
-    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
-    get 'show', :id => 'foo', :format => 'atom'
-    response.should render_template('articles/_atom_feed')
-  end
-
-  it 'should render the rss feed for /articles/tag/foo.rss' do
-    get 'show', :id => 'foo', :format => 'rss'
-    response.should render_template('articles/_rss20_feed')
-  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
-
-#   it "test_autodiscovery_tag" do
-#     get :tag, :id => 'hardware'
-#     assert_response :success
-#     assert_select 'link[title=RSS]' do
-#       assert_select '[rel=alternate]'
-#       assert_select '[type=application/rss+xml]'
-#       assert_select '[href=http://test.host/articles/tag/hardware.rss]'
-#     end
-#     assert_select 'link[title=Atom]' do
-#       assert_select '[rel=alternate]'
-#       assert_select '[type=application/atom+xml]'
-#       assert_select '[href=http://test.host/articles/tag/hardware.atom]'
-#     end
-#   end

data/spec/controllers/textfilter_controller_spec.rb

@@ -1,192 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-require 'flickr_mock'
-
-describe TextfilterController do
-  before do
-    reset_whiteboard
-
-    get :test_action # set up @url; In Rails 1.0, we can't do url_for without it.
-  end
-
-  def blog
-    blogs(:default)
-  end
-
-  def filter_text(text, filters, filterparams={})
-    TextFilter.filter_text(blog, text, self, filters, filterparams)
-  end
-
-  def whiteboard
-    @whiteboard ||= Hash.new
-  end
-
-  def reset_whiteboard
-    @whiteboard = nil
-  end
-
-  it "test_unknown" do
-    text = filter_text('*foo*',[:unknowndoesnotexist])
-    assert_equal '*foo*', text
-  end
-
-  it "test_smartypants" do
-    text = filter_text('"foo"',[:smartypants])
-    assert_equal '“foo”', text
-  end
-
-  it "test_markdown" do
-    text = filter_text('*foo*', [:markdown])
-    assert_equal '<p><em>foo</em></p>', text
-
-    text = filter_text("foo\n\nbar",[:markdown])
-    assert_equal "<p>foo</p>\n\n<p>bar</p>", text
-  end
-
-  it "test_filterchain" do
-    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
-      filter_text('*"foo"*',[:markdown,:smartypants])
-
-    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
-      filter_text('*"foo"*',[:doesntexist1,:markdown,"doesn't exist 2",:smartypants,:nopenotmeeither])
-  end
-
-  it "test_flickr" do
-    assert_equal "<div style=\"float:left\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
-      filter_text('<typo:flickr img="31366117" size="Square" style="float:left"/>',
-        [:macropre,:macropost],
-        {'flickr-user' => 'scott@sigkill.org'})
-
-    # Test default image size
-    assert_equal "<div style=\"\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
-      filter_text('<typo:flickr img="31366117"/>',
-        [:macropre,:macropost],
-        {'flickr-user' => 'scott@sigkill.org'})
-
-    # Test with caption=""
-    assert_equal "<div style=\"\" class=\"flickrplugin\"><a href=\"http://www.flickr.com/users/scottlaird/31366117\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a></div>",
-      filter_text('<typo:flickr img="31366117" caption=""/>',
-        [:macropre,:macropost],
-        {'flickr-user' => 'scott@sigkill.org'})
-  end
-
-  it "test_broken_flickr_link" do
-    assert_equal %{<div class='broken_flickr_link'>\`notaflickrid\' could not be displayed because: <br />Photo not found</div>},
-      filter_text('<typo:flickr img="notaflickrid" />',
-        [:macropre, :macropost],
-        { 'flickr-user' => 'scott@sigkill.org' })
-  end
-
-  describe 'code textfilter' do
-    
-    describe 'single line' do
-
-      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
-
-      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
-
-      it 'should render ruby' do
-      filter_text(%{
-<typo:code lang="ruby">
-class Foo
-  def bar
-    @a = "zzz"
-  end
-end
-</typo:code>
-},[: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
-
-  it "test_named_filter" do
-    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
-      TextFilter.filter_text_by_name(blog, '*"foo"*', 'markdown smartypants')
-  end
-
-  it "test_code_plus_markup_chain" do
-    text = <<-EOF
-*header text here*
-
-<typo:code lang="ruby">
-class test
-  def method
-    "foo"
-  end
-end
-</typo:code>
-
-_footer text here_
-
-EOF
-
-    expects_markdown = <<-EOF
-<p><em>header text here</em></p>
-
-<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
-
-    expects_textile = <<-EOF
-<p><strong>header text here</strong></p>
-<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
-
-    assert_equal expects_markdown.strip, TextFilter.filter_text_by_name(blog, text, 'markdown')
-    assert_equal expects_textile.strip, TextFilter.filter_text_by_name(blog, text, 'textile')
-  end
-
-  it "test_lightbox" do
-    assert_equal "<div style=\"float:left\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_b.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_t.jpg\" width=\"67\" height=\"100\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:67px\">This is Matz, Ruby's creator</p></div>",
-      filter_text('<typo:lightbox img="31366117" thumbsize="Thumbnail" displaysize="Large" style="float:left"/>',
-        [:macropre,:macropost],
-        {})
-
-#     Test default thumb image size
-    assert_equal "<div style=\"\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_b.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
-      filter_text('<typo:lightbox img="31366117" displaysize="Large"/>',
-        [:macropre,:macropost],
-        {})
-
-#     Test default display image size
-    assert_equal "<div style=\"\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_o.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a><p class=\"caption\" style=\"width:75px\">This is Matz, Ruby's creator</p></div>",
-      filter_text('<typo:lightbox img="31366117"/>',
-        [:macropre,:macropost],
-        {})
-
-#     Test with caption=""
-    assert_equal "<div style=\"\" class=\"lightboxplugin\"><a href=\"http://photos23.flickr.com/31366117_b1a791d68e_o.jpg\" rel=\"lightbox\" title=\"Matz\"><img src=\"http://photos23.flickr.com/31366117_b1a791d68e_s.jpg\" width=\"75\" height=\"75\" alt=\"Matz\" title=\"Matz\"/></a></div>",
-      filter_text('<typo:lightbox img="31366117" caption=""/>',
-        [:macropre,:macropost],
-        {})
-  end
-end