Merge branch 'stable'

This commit is contained in:
Nathan Weizenbaum 2009-01-09 15:29:36 -08:00
commit a84a6aaf3e
1 changed files with 13 additions and 4 deletions

View File

@ -106,15 +106,24 @@ class SassPluginTest < Test::Unit::TestCase
end
require 'sass/plugin/merb'
MerbHandler.send(:define_method, :process_without_sass) { |*args| }
if defined?(MerbHandler)
MerbHandler.send(:define_method, :process_without_sass) { |*args| }
else
Merb::Rack::Application.send(:define_method, :call_without_sass) { |*args| }
end
set_plugin_opts
File.delete(tempfile_loc('basic'))
assert Sass::Plugin.stylesheet_needs_update?('basic')
assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
MerbHandler.new('.').process nil, nil
if defined?(MerbHandler)
MerbHandler.new('.').process nil, nil
else
Merb::Rack::Application.new.call(::Rack::MockRequest.env_for('/'))
end
assert !Sass::Plugin.stylesheet_needs_update?('basic')
assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
end
def test_doesnt_render_partials