diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-03-10 21:44:53 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-03-10 21:44:53 +0100 |
| commit | af0d7d807c87097346584d06b7be59b5c5e656e2 (patch) | |
| tree | 64b3eec10c23c920699115369c1ad01e74769537 /test | |
| parent | 46fc5486cde5cf1816cba945eb74eff5a8228aa7 (diff) | |
| parent | 3d7f34571a0b2e58ee90498bc54f160bda2bed45 (diff) | |
| download | coderay-af0d7d807c87097346584d06b7be59b5c5e656e2.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Diffstat (limited to 'test')
| -rw-r--r-- | test/executable/suite.rb | 5 | ||||
| -rwxr-xr-x | test/functional/examples.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/executable/suite.rb b/test/executable/suite.rb index f3495d6..d386f4b 100644 --- a/test/executable/suite.rb +++ b/test/executable/suite.rb @@ -14,12 +14,13 @@ class TestCodeRayExecutable < Test::Unit::TestCase ROOT_DIR = Pathname.new(File.dirname(__FILE__)) + '..' + '..' EXECUTABLE = ROOT_DIR + 'bin' + 'coderay' + RUBY_COMMAND = RUBY_VERSION < '2.0.0' ? 'ruby -w' : 'ruby' # Ruby 2 currently throws warnings for bundler EXE_COMMAND = if RUBY_PLATFORM === 'java' && `ruby --ng -e '' 2> /dev/null` && $?.success? # use Nailgun - 'ruby --ng -wI%s %s' + "#{RUBY_COMMAND}--ng -I%s %s" else - 'ruby -wI%s %s' + "#{RUBY_COMMAND} -I%s %s" end % [ROOT_DIR + 'lib', EXECUTABLE] def coderay args, options = {} diff --git a/test/functional/examples.rb b/test/functional/examples.rb index ff64af3..15f9ca3 100755 --- a/test/functional/examples.rb +++ b/test/functional/examples.rb @@ -22,7 +22,7 @@ end CODE assert_equal <<-DIV, div <table class="CodeRay"><tr> - <td class="line-numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><a href="#n1" name="n1">1</a> + <td class="line-numbers"><pre><a href="#n1" name="n1">1</a> <a href="#n2" name="n2">2</a> <a href="#n3" name="n3">3</a> </pre></td> @@ -38,7 +38,7 @@ end <body> <table class="CodeRay"><tr> - <td class="line-numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre> + <td class="line-numbers"><pre><a href="#n1" name="n1">1</a> </pre></td> <td class="code"><pre>puts <span class="string"><span class="delimiter">"</span><span class="content">Hello, world!</span><span class="delimiter">"</span></span></pre></td> </tr></table> |