github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix failing test when updating to latest SASS

Browse Source 
This makes rake test green on Rubinius, 1.8.7 and 1.9.2.
Removed the Gemfile.lock in the previous version so everything
can be updated.

Closes GH-456.
This commit is contained in:
Dirkjan Bussink 2011-07-03 21:46:46 +02:00 committed by Chris Eppstein
parent 10168fe147
commit 42bb556329
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/units/configuration_test.rb
View File

@ -101,7 +101,7 @@ class ConfigurationTest < Test::Unit::TestCase
plugin_opts = Compass.configuration.to_sass_plugin_options plugin_opts = Compass.configuration.to_sass_plugin_options
assert load_paths.include?("/home/chris/my_compass_project/../foo") assert load_paths.include?("/home/chris/foo")
assert load_paths.include?("/path/to/my/framework"), load_paths.inspect assert load_paths.include?("/path/to/my/framework"), load_paths.inspect
assert_equal "/home/chris/my_compass_project/css/framework", plugin_opts[:template_location].find{|s,c| s == "/path/to/my/framework"}[1] assert_equal "/home/chris/my_compass_project/css/framework", plugin_opts[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
assert_equal "/home/chris/my_compass_project/css/foo", plugin_opts[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1] assert_equal "/home/chris/my_compass_project/css/foo", plugin_opts[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
@ -141,7 +141,7 @@ EXPECTED
load_paths = load_paths_as_strings(Compass.configuration.to_sass_engine_options[:load_paths]) load_paths = load_paths_as_strings(Compass.configuration.to_sass_engine_options[:load_paths])
assert load_paths.include?("/home/chris/my_compass_project/../foo") assert load_paths.include?("/home/chris/foo")
assert load_paths.include?("/path/to/my/framework"), load_paths.inspect assert load_paths.include?("/path/to/my/framework"), load_paths.inspect
assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1] assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1] assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]