typo 3.99.0

data/test/functional/backend_controller_test.rb

@@ -0,0 +1,273 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'backend_controller'
+require 'blogger_service'
+require 'digest/sha1'
+require 'base64'
+
+# Re-raise errors caught by the controller.
+class BackendController; def rescue_action(e) raise e end; end
+
+class BackendControllerTest < Test::Unit::TestCase
+  fixtures :contents, :categories, :blogs, :users, :articles_categories, :text_filters
+
+  def setup
+    @controller = BackendController.new
+    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
+    @protocol = :xmlrpc
+  end
+
+  # BloggerApi Tests
+  def test_blogger_delete_post
+    args = [ 'foo', 3, 'tobi', 'whatever', 1 ]
+
+    result = invoke_layered :blogger, :deletePost, *args
+    assert_raise(ActiveRecord::RecordNotFound) { Article.find(3) }
+  end
+
+  def test_blogger_get_users_blogs
+    args = [ 'foo', 'tobi', 'whatever' ]
+
+    result = invoke_layered :blogger, :getUsersBlogs, *args
+    assert_equal result.first['blogName'], 'test blog'
+  end
+
+  def test_blogger_get_user_info
+    args = [ 'foo', 'tobi', 'whatever' ]
+
+    result = invoke_layered :blogger, :getUserInfo, *args
+    assert_equal 'tobi', result['userid']
+  end
+
+  def test_blogger_new_post
+    args = [ 'foo', '1', 'tobi', 'whatever', '<title>new post title</title>new post *body*', 1]
+
+    result = invoke_layered :blogger, :newPost, *args
+    assert_not_nil result
+    new_post = Article.find(result)
+    assert_equal "new post title", new_post.title
+    assert_equal "new post *body*", new_post.body
+    assert_equal "<p>new post <strong>body</strong></p>", new_post.html(@controller, :body)
+    assert_equal "textile", new_post.text_filter.name
+    assert_equal users(:tobi), new_post.user
+    assert_equal this_blog.id, new_post.blog_id
+    assert new_post.published?
+    assert new_post[:published_at]
+  end
+
+  def test_blogger_new_post_no_title
+    args = [ 'foo', '1', 'tobi', 'whatever', 'new post body for post without title but with a lenghty body', 1]
+
+    result = invoke_layered :blogger, :newPost, *args
+    assert_not_nil result
+    new_post = Article.find(result)
+    assert_equal "new post body for post without", new_post.title
+    assert_equal "new post body for post without title but with a lenghty body", new_post.body
+    assert_equal "<p>new post body for post without title but with a lenghty body</p>", new_post.html(@controller, :body)
+  end
+
+  def test_blogger_new_post_with_categories
+    args = [ 'foo', '1', 'tobi', 'whatever', '<title>new post title</title><category>Software, Hardware</category>new post body', 1]
+
+    result = invoke_layered :blogger, :newPost, *args
+    assert_not_nil result
+    new_post = Article.find(result)
+    assert_equal "new post title", new_post.title
+    assert_equal "new post body", new_post.body
+    assert_equal [categories(:software), categories(:hardware)], new_post.categories.sort_by { |c| c.id }
+    assert_equal this_blog.id, new_post.blog_id
+    assert new_post.published?
+  end
+
+  def test_blogger_new_post_with_non_existing_categories
+    args = [ 'foo', '1', 'tobi', 'whatever', '<title>new post title</title><category>Idontexist, Hardware</category>new post body', 1]
+
+    result = invoke_layered :blogger, :newPost, *args
+    assert_not_nil result
+    new_post = Article.find(result)
+    assert_equal [categories(:hardware)], new_post.categories
+    assert_equal this_blog.id, new_post.blog_id
+  end
+
+  def test_blogger_fail_authentication
+    args = [ 'foo', 'tobi', 'using a wrong password' ]
+    # This will be a little more useful with the upstream changes in [1093]
+    assert_raise(XMLRPC::FaultException) { invoke_layered :blogger, :getUsersBlogs, *args }
+  end
+
+  # Meta Weblog Tests
+  def test_meta_weblog_get_categories
+    args = [ 1, 'tobi', 'whatever' ]
+
+    result = invoke_layered :metaWeblog, :getCategories, *args
+    assert_equal 'Software', result.first
+  end
+
+  def test_meta_weblog_get_post
+    args = [ 1, 'tobi', 'whatever' ]
+
+    result = invoke_layered :metaWeblog, :getPost, *args
+    assert_equal result['title'], 'Article 1!'
+  end
+
+  def test_meta_weblog_get_recent_posts
+    args = [ 1, 'tobi', 'whatever', 2 ]
+
+    result = invoke_layered :metaWeblog, :getRecentPosts, *args
+    assert_equal result.size, 2
+    assert_equal result.last['title'], 'Article 1!'
+  end
+
+  def test_meta_weblog_delete_post
+    args = [ 1, 2, 'tobi', 'whatever', 1 ]
+
+    result = invoke_layered :metaWeblog, :deletePost, *args
+    assert_raise(ActiveRecord::RecordNotFound) { Article.find(2) }
+  end
+
+  def test_meta_weblog_edit_post
+    article = Article.find(1)
+    article.title = "Modified!"
+    article.body = "this is a *test*"
+    article.text_filter = TextFilter.find_by_name("textile")
+    article.published_at = Time.now.midnight
+
+    args = [ 1, 'tobi', 'whatever', MetaWeblogService.new(@controller).article_dto_from(article), 1 ]
+
+    result = invoke_layered :metaWeblog, :editPost, *args
+    assert result
+
+    new_article = Article.find(1)
+
+    assert_equal article.title, new_article.title
+    assert_equal article.body, new_article.body
+    assert_equal "<p>this is a <strong>test</strong></p>", new_article.html(@controller, :body)
+    assert_equal Time.now.midnight.to_s, new_article.published_at.to_s
+    assert_equal this_blog.id, new_article.blog_id
+  end
+
+  def test_meta_weblog_new_post
+    article = Article.new
+    article.title = "Posted via Test"
+    article.body = "body"
+    article.extended = "extend me"
+    article.text_filter = TextFilter.find_by_name("textile")
+    article.published_at = Time.now.midnight
+
+    args = [ 1, 'tobi', 'whatever', MetaWeblogService.new(@controller).article_dto_from(article), 1 ]
+
+    result = invoke_layered :metaWeblog, :newPost, *args
+    assert result
+    new_post = Article.find(result)
+
+    assert_equal "Posted via Test", new_post.title
+    assert_equal "textile", new_post.text_filter.name
+    assert_equal article.body, new_post.body
+    assert_equal "<p>body</p>", new_post.html(@controller, :body)
+    assert_equal article.extended, new_post.extended
+    assert_equal "<p>extend me</p>", new_post.html(@controller, :extended)
+    assert_equal Time.now.midnight.to_s, new_post.published_at.to_s
+    assert_equal this_blog.id, new_post.blog_id
+  end
+
+  def test_meta_weblog_new_media_object
+    media_object = MetaWeblogStructs::MediaObject.new(
+      "name" => Digest::SHA1.hexdigest("upload-test--#{Time.now}--") + ".jpg",
+      "type" => "image/jpeg",
+      "bits" => Base64.encode64(File.open(File.expand_path(RAILS_ROOT) + "/public/images/header.jpg", "rb") { |f| f.read })
+    )
+
+    args = [ 1, 'tobi', 'whatever', media_object ]
+
+    result = invoke_layered :metaWeblog, :newMediaObject, *args
+    assert result['url'] =~ /#{media_object['name']}/
+    assert File.unlink(File.expand_path(RAILS_ROOT) + "/public/files/#{media_object['name']}")
+  end
+
+  def test_meta_weblog_fail_authentication
+    args = [ 1, 'tobi', 'using a wrong password', 2 ]
+    # This will be a little more useful with the upstream changes in [1093]
+    assert_raise(XMLRPC::FaultException) { invoke_layered :metaWeblog, :getRecentPosts, *args }
+  end
+
+  # Movable Type Tests
+
+  def test_mt_get_category_list
+    args = [ 1, 'tobi', 'whatever' ]
+
+    result = invoke_layered :mt, :getCategoryList, *args
+    assert result.map { |c| c['categoryName'] }.include?('Software')
+  end
+
+  def test_mt_get_post_categories
+    article = Article.find(1)
+    article.categories << categories(:software)
+
+    args = [ 1, 'tobi', 'whatever' ]
+
+    result = invoke_layered :mt, :getPostCategories, *args
+    assert_equal result.first['categoryName'], article.categories.first['name']
+  end
+
+  def test_mt_get_recent_post_titles
+    args = [ 1, 'tobi', 'whatever', 2 ]
+
+    result = invoke_layered :mt, :getRecentPostTitles, *args
+    assert_equal result.first['title'], Article.find(2).title
+  end
+
+  def test_mt_set_post_categories
+    args = [ 2, 'tobi', 'whatever',
+      [MovableTypeStructs::CategoryPerPost.new('categoryName' => 'personal', 'categoryId' => 3, 'isPrimary' => 1)] ]
+
+    result = invoke_layered :mt, :setPostCategories, *args
+    assert_equal [categories(:personal)], Article.find(2).categories
+
+    args = [ 2, 'tobi', 'whatever',
+      [MovableTypeStructs::CategoryPerPost.new('categoryName' => 'Software', 'categoryId' => 1, 'isPrimary' => 1),
+       MovableTypeStructs::CategoryPerPost.new('categoryName' => 'Hardware', 'categoryId' => 2, 'isPrimary' => 0) ]]
+
+     result = invoke_layered :mt, :setPostCategories, *args
+
+     assert Article.find(2).categories.include?(categories(:hardware))
+
+  end
+
+  def test_mt_supported_text_filters
+    result = invoke_layered :mt, :supportedTextFilters
+    assert result.map {|f| f['label']}.include?('Markdown')
+    assert result.map {|f| f['label']}.include?('Textile')
+  end
+
+  def test_mt_supported_methods
+    result = invoke_layered :mt, :supportedMethods
+    assert_equal 8, result.size
+    assert result.include?("publishPost")
+  end
+
+  def test_mt_get_trackback_pings
+    args = [ 1 ]
+
+    result = invoke_layered :mt, :getTrackbackPings, *args
+
+    assert_equal result.first['pingTitle'], 'Trackback Entry'
+  end
+
+  def test_mt_publish_post
+    args = [ 4, 'tobi', 'whatever' ]
+
+    assert (not Article.find(4).published?)
+
+    result = invoke_layered :mt, :publishPost, *args
+
+    assert result
+    assert Article.find(4).published?
+    assert Article.find(4)[:published_at]
+  end
+
+  def test_mt_fail_authentication
+    args = [ 1, 'tobi', 'using a wrong password', 2 ]
+    # This will be a little more useful with the upstream changes in [1093]
+    assert_raise(XMLRPC::FaultException) { invoke_layered :mt, :getRecentPostTitles, *args }
+  end
+
+end

data/test/functional/redirect_controller_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'redirect_controller'
+
+# Re-raise errors caught by the controller.
+class RedirectController; def rescue_action(e) raise e end; end
+
+class RedirectControllerTest < Test::Unit::TestCase
+  fixtures :redirects
+
+  def setup
+    @controller = RedirectController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    
+    @request.relative_url_root = nil # avoid failures if environment.rb defines a relative URL root
+  end
+
+  # Replace this with your real tests.
+  def test_redirect
+    get :redirect, :from => "foo/bar"
+    assert_response 301
+    assert_redirected_to "/someplace/else"
+  end
+
+  def test_url_root_redirect
+    @request.relative_url_root = "/blog"
+    get :redirect, :from => "foo/bar"
+    assert_response 301
+    assert_redirected_to "/blog/someplace/else"
+    
+    get :redirect, :from => "bar/foo"
+    assert_response 301
+    assert_redirected_to "/blog/someplace/else"
+  end
+
+  def test_no_redirect
+    get :redirect, :from => "something/that/isnt/there"
+    assert_response 404
+  end
+end

data/test/functional/textfilter_controller_test.rb

@@ -0,0 +1,275 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'textfilter_controller'
+
+require 'flickr_mock'
+
+# Re-raise errors caught by the controller.
+class TextfilterController; def rescue_action(e) raise e end; end
+class ActionController::Base; def rescue_action(e) raise e end; end
+
+class TextfilterControllerTest < Test::Unit::TestCase
+  fixtures :text_filters
+
+  def setup
+    @controller = TextfilterController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller.request = @request
+    @controller.response = @response
+    @controller.assigns ||= []
+    reset_whiteboard
+
+    get :test_action # set up @url; In Rails 1.0, we can't do url_for without it.
+
+#    @controller.initialize_current_url #rescue nil
+  end
+
+  def filter_text(text, filters, filterparams={}, filter_html=false)
+    TextFilter.filter_text(text, @controller, self, filters, filterparams, filter_html)
+  end
+
+  def whiteboard
+    @whiteboard ||= Hash.new
+  end
+
+  def reset_whiteboard
+    @whiteboard = nil
+  end
+
+  def sparklines_available
+    begin
+      Plugins::Textfilters::SparklineController
+    rescue NameError
+      false
+    end
+  end
+
+  def test_unknown
+    text = filter_text('*foo*',[:unknowndoesnotexist])
+    assert_equal '*foo*', text
+  end
+
+  def test_smartypants
+    text = filter_text('"foo"',[:smartypants])
+    assert_equal '&#8220;foo&#8221;', text
+  end
+
+  def test_markdown
+    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
+
+  def test_filterchain
+    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])
+
+    assert_equal '<p>foo</p>',
+      filter_text('<p>foo</p>',[],{},false)
+
+    assert_equal '&lt;p&gt;foo&lt;/p&gt;',
+      filter_text('<p>foo</p>',[],{},true)
+  end
+
+  def test_amazon
+    text = filter_text('<a href="amazon:097669400X" title="Rails">Rails book</a>',
+      [:amazon],
+      'amazon-associate-id' => 'scottstuff-20')
+    assert_equal "<a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\" title=\"Rails\">Rails book</a>",
+      text
+    assert_equal %w{097669400X}, whiteboard[:asins]
+    reset_whiteboard
+
+    text = filter_text('[Rails book](amazon:097669400X)',
+      [:markdown,:amazon],
+      'amazon-associate-id' => 'scottstuff-20')
+    assert_equal "<p><a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\">Rails book</a></p>",
+      text
+    assert_equal %w{097669400X}, whiteboard[:asins]
+    reset_whiteboard
+
+
+    text = filter_text("Foo\n\n[Rails book](amazon:097669400X)",
+      [:markdown,:amazon],
+      'amazon-associate-id' => 'scottstuff-20')
+    assert_equal "<p>Foo</p>\n\n<p><a href=\"http://www.amazon.com/exec/obidos/ASIN/097669400X/scottstuff-20\">Rails book</a></p>",
+          text
+    assert_equal %w{097669400X}, whiteboard[:asins]
+    reset_whiteboard
+  end
+
+  def test_flickr
+    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
+
+  def test_broken_flickr_link
+    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
+
+  def test_sparkline
+    return unless sparklines_available
+
+    tag = filter_text('<typo:sparkline foo="bar"/>',[:macropre,:macropost])
+    # url_for returns query params in hash order, which isn't stable, so we can't just compare
+    # with a static string.  Yuck.
+    assert tag =~ %r{^<img  src="http://test.host/plugins/filters/sparkline/plot\?(data=|foo=bar|&)+"/>$}
+
+    assert_equal "<img  title=\"aaa\" src=\"http://test.host/plugins/filters/sparkline/plot?data=\"/>",
+      filter_text('<typo:sparkline title="aaa"/>',[:macropre,:macropost])
+
+    assert_equal "<img  style=\"bbb\" src=\"http://test.host/plugins/filters/sparkline/plot?data=\"/>",
+      filter_text('<typo:sparkline style="bbb"/>',[:macropre,:macropost])
+
+    tag = filter_text('<typo:sparkline alt="ccc"/>',[:macropre,:macropost])
+    assert_tag_in tag, :tag => 'img', :attributes => {
+        'alt' => 'ccc',
+        'src' => URI.parse('http://test.host/plugins/filters/sparkline/plot?data=')
+    }, :children => { :count => 0 }
+
+    tag = filter_text('<typo:sparkline type="smooth" data="1 2 3 4"/>',[:macropre,:macropost])
+    assert_tag_in tag, :tag => 'img', :attributes => {
+        'src' => URI.parse('http://test.host/plugins/filters/sparkline/plot?data=1%2C2%2C3%2C4&type=smooth')
+    }, :children => { :count => 0 }
+
+    assert_equal "<img  src=\"http://test.host/plugins/filters/sparkline/plot?data=1%2C2%2C3%2C4%2C5%2C6\"/>",
+      filter_text('<typo:sparkline>1 2 3 4 5 6</typo:sparkline>',[:macropre,:macropost])
+  end
+
+  def test_sparkline_plot
+    return unless sparklines_available
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot', :data => '1,2,3'
+    assert_response :success
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot2', :data => '1,2,3'
+    assert_response :missing
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot', :data => '1,2,3', :type => 'smooth'
+    assert_response :success
+
+    get 'public_action', :filter => 'sparkline', :public_action => 'plot', :data => '1,2,3', :type => 'instance_methods'
+    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])
+
+    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])
+
+    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
+
+  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},
+      filter_text(%{
+<typo:code lang="ruby">
+class Foo
+  def bar
+    @a = "zzz"
+  end
+end
+</typo:code>
+},[:macropre,:macropost])
+  end
+
+  def test_named_filter
+    assert_equal '<p><em>&#8220;foo&#8221;</em></p>',
+      TextFilter.filter_text_by_name('*"foo"*', @controller, 'markdown smartypants')
+  end
+
+  def test_code_plus_markup_chain
+    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="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>
+
+<p><em>footer text here</em></p>
+EOF
+
+    expects_textile = <<-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>
+
+\t<p><em>footer text here</em></p>
+EOF
+
+    assert_equal expects_markdown.strip, TextFilter.filter_text_by_name(text, @controller, 'markdown')
+    assert_equal expects_textile.strip, TextFilter.filter_text_by_name(text, @controller, 'textile')
+  end
+
+  def test_lightbox
+    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