Permalink
Browse files

match tender deps and fix tests, sigh

  • Loading branch information...
zenhob committed Feb 24, 2011
1 parent 4d56d38 commit 8c4dbba4c03b5c65a65db64ded43ee8da6ad8962
Showing with 3 additions and 3 deletions.
  1. +1 −1 Rakefile
  2. +2 −2 test/model_formatting_test.rb
View
@@ -12,7 +12,7 @@ spec = Gem::Specification.new do |s|
s.files = FileList['[a-zA-Z]*', 'bin/*', 'lib/**/*', 'rails/**/*', 'test/**/*']
s.has_rdoc = false
s.extra_rdoc_files = ["README"]
- s.add_dependency("rdiscount", "~>1.6.5")
+ s.add_dependency("rdiscount", "~>1.5.8")
s.add_dependency("actionpack", "~>2.2.3")
s.add_dependency("activerecord", "~>2.2.3")
s.add_dependency("activesupport", "~>2.2.3")
@@ -67,11 +67,11 @@ class ModelFormattingTest < Test::Unit::TestCase
end
it "converts @@@ with params to code blocks" do
- ModelFormatting.process(:html, "foo\n@@@ ninja\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n").should == %(<div><p>foo</p>\n\n<pre><code class=\"ninja\">bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p></div>)
+ ModelFormatting.process(:html, "foo\n@@@ ninja\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n").should == %(<div><p>foo<br/>\n</p>\n\n<pre><code class=\"ninja\">bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p></div>)
end
it "fixes irregular number of @@@'s" do
- ModelFormatting.process(:html, "foo\n@@@\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n@@@").should == %(<div><p>foo</p>\n\n<pre><code>bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p>\n\n<pre><code></code>\n</pre></div>)
+ ModelFormatting.process(:html, "foo\n@@@\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n@@@").should == %(<div><p>foo<br/>\n</p>\n\n<pre><code>bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p>\n\n<pre><code></code>\n</pre></div>)
end
it "converts @@@ with params to code blocks with text format" do

0 comments on commit 8c4dbba

Please sign in to comment.