diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 19:46:24 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 19:46:24 +0200 |
commit | e13565493d07582d9e9f9cffb671ee0a3590ab51 (patch) | |
tree | 159bba3e58527d1c6e1a63ed6c71d62568633a6a | |
parent | 737fb3608c92506a573a79f611b94ff5d5da18e6 (diff) | |
download | coderay-e13565493d07582d9e9f9cffb671ee0a3590ab51.tar.gz |
fix tests
-rw-r--r-- | test/functional/for_redcloth.rb | 14 | ||||
-rwxr-xr-x | test/unit/plugin.rb | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/test/functional/for_redcloth.rb b/test/functional/for_redcloth.rb index e980667..9fd244e 100644 --- a/test/functional/for_redcloth.rb +++ b/test/functional/for_redcloth.rb @@ -1,5 +1,4 @@ require 'test/unit' -require File.expand_path('../../lib/assert_warning', __FILE__) $:.unshift File.expand_path('../../../lib', __FILE__) require 'coderay' @@ -66,19 +65,14 @@ class BasicTest < Test::Unit::TestCase # See http://jgarber.lighthouseapp.com/projects/13054/tickets/124-code-markup-does-not-allow-brackets. def test_for_redcloth_false_positive require 'coderay/for_redcloth' - assert_warning 'CodeRay::Scanners could not load plugin :project; falling back to :text' do - assert_equal '<p><code>[project]_dff.skjd</code></p>', - RedCloth.new('@[project]_dff.skjd@').to_html - end + assert_equal '<p><code>[project]_dff.skjd</code></p>', + RedCloth.new('@[project]_dff.skjd@').to_html # false positive, but expected behavior / known issue assert_equal "<p><span lang=\"ruby\" class=\"CodeRay\">_dff.skjd</span></p>", RedCloth.new('@[ruby]_dff.skjd@').to_html - assert_warning 'CodeRay::Scanners could not load plugin :project; falling back to :text' do - assert_equal <<-BLOCKCODE.chomp, + assert_equal <<-BLOCKCODE.chomp, RedCloth.new('bc. [project]_dff.skjd').to_html <pre><code>[project]_dff.skjd</code></pre> - BLOCKCODE - RedCloth.new('bc. [project]_dff.skjd').to_html - end + BLOCKCODE end end if defined? RedCloth
\ No newline at end of file diff --git a/test/unit/plugin.rb b/test/unit/plugin.rb index a1d06e1..41eec51 100755 --- a/test/unit/plugin.rb +++ b/test/unit/plugin.rb @@ -1,6 +1,5 @@ require 'test/unit' require 'pathname' -require File.expand_path('../../lib/assert_warning', __FILE__) $:.unshift File.expand_path('../../../lib', __FILE__) require 'coderay' @@ -39,9 +38,7 @@ class PluginScannerTest < Test::Unit::TestCase def test_default assert_nothing_raised do - assert_warning 'PluginScannerTest::PluginsWithDefault could not load plugin :gargamel; falling back to :default_plugin' do - assert_operator PluginsWithDefault[:gargamel], :<, PluginsWithDefault::Plugin - end + assert_operator PluginsWithDefault[:gargamel], :<, PluginsWithDefault::Plugin end assert_equal PluginsWithDefault::Default, PluginsWithDefault.default end |