Merge branch 'stable'
This commit is contained in:
commit
a84a6aaf3e
|
@ -106,15 +106,24 @@ class SassPluginTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
require 'sass/plugin/merb'
|
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
|
set_plugin_opts
|
||||||
|
|
||||||
File.delete(tempfile_loc('basic'))
|
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
|
end
|
||||||
|
|
||||||
def test_doesnt_render_partials
|
def test_doesnt_render_partials
|
||||||
|
|
Loading…
Reference in New Issue