summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/basic.rb6
-rw-r--r--test/functional/for_redcloth.rb6
-rwxr-xr-xtest/functional/suite.rb2
3 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/basic.rb b/test/functional/basic.rb
index 150089e..013c0c4 100755
--- a/test/functional/basic.rb
+++ b/test/functional/basic.rb
@@ -14,12 +14,12 @@ class BasicTest < Test::Unit::TestCase
RUBY_TEST_TOKENS = [
['puts', :ident],
[' ', :space],
- [:open, :string],
+ [:begin_group, :string],
['"', :delimiter],
['Hello, World!', :content],
['"', :delimiter],
- [:close, :string]
- ]
+ [:end_group, :string]
+ ].flatten
def test_simple_scan
assert_nothing_raised do
assert_equal RUBY_TEST_TOKENS, CodeRay.scan(RUBY_TEST_CODE, :ruby).to_ary
diff --git a/test/functional/for_redcloth.rb b/test/functional/for_redcloth.rb
index a1c3100..a8a737a 100644
--- a/test/functional/for_redcloth.rb
+++ b/test/functional/for_redcloth.rb
@@ -1,5 +1,5 @@
require 'test/unit'
-$: << 'lib'
+$:.unshift 'lib'
require 'coderay'
begin
@@ -14,11 +14,11 @@ class BasicTest < Test::Unit::TestCase
def test_for_redcloth
require 'coderay/for_redcloth'
- assert_equal "<p><span lang=\"ruby\" class=\"CodeRay\">puts <span style=\"background-color:#fff0f0;color:#D20\"><span style=\"color:#710\">&quot;</span><span style=\"\">Hello, World!</span><span style=\"color:#710\">&quot;</span></span></span></p>",
+ assert_equal "<p><span lang=\"ruby\" class=\"CodeRay\">puts <span style=\"background-color:hsla(0,100%,50%,0.1);color:#D20\"><span style=\"color:#710\">&quot;</span><span style=\"\">Hello, World!</span><span style=\"color:#710\">&quot;</span></span></span></p>",
RedCloth.new('@[ruby]puts "Hello, World!"@').to_html
assert_equal <<-BLOCKCODE.chomp,
<div lang="ruby" class="CodeRay">
- <div class="code"><pre>puts <span style="background-color:#fff0f0;color:#D20"><span style="color:#710">&quot;</span><span style="">Hello, World!</span><span style="color:#710">&quot;</span></span></pre></div>
+ <div class="code"><pre>puts <span style="background-color:hsla(0,100%,50%,0.1);color:#D20"><span style="color:#710">&quot;</span><span style="">Hello, World!</span><span style="color:#710">&quot;</span></span></pre></div>
</div>
BLOCKCODE
RedCloth.new('bc[ruby]. puts "Hello, World!"').to_html
diff --git a/test/functional/suite.rb b/test/functional/suite.rb
index 039ab47..97dd330 100755
--- a/test/functional/suite.rb
+++ b/test/functional/suite.rb
@@ -2,7 +2,7 @@ require 'test/unit'
MYDIR = File.dirname(__FILE__)
-$: << 'lib'
+$:.unshift 'lib'
require 'coderay'
puts "Running basic CodeRay #{CodeRay::VERSION} tests..."