diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 13:29:01 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 13:29:01 +0200 |
| commit | 1d445c70edf8d5c878f9a830dcd29f5a3e179923 (patch) | |
| tree | 75ad0b7db37981acd3bf54984353e70229e351ad /test/functional | |
| parent | d9d6dd5f4a73363ea5d353ecda142f77ed4eba5a (diff) | |
| parent | 1e330f16c21c45eff375ba3b12f966c76ba0b393 (diff) | |
| download | coderay-1d445c70edf8d5c878f9a830dcd29f5a3e179923.tar.gz | |
Merge branch 'master' into upstream
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/examples.rb | 2 | ||||
| -rw-r--r-- | test/functional/for_redcloth.rb | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/test/functional/examples.rb b/test/functional/examples.rb index 15f9ca3..985ef87 100755 --- a/test/functional/examples.rb +++ b/test/functional/examples.rb @@ -114,7 +114,7 @@ Token Types (7): # format the tokens term = terminal_encoder.encode_tokens(tokens) - assert_equal "\e[1;31mimport\e[0m \e[33mthis\e[0m; \e[37m# The Zen of Python\e[0m", term + assert_equal "\e[32mimport\e[0m \e[31mthis\e[0m; \e[1;30m# The Zen of Python\e[0m", term # re-using scanner and encoder ruby_highlighter = CodeRay::Duo[:ruby, :div] 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 |