Merge branch 'master' into rails31
* master: Revert "Disable 1.8.7 and rbx for now." Ignore charset in blueprint files This file has utf-8 chars in the comments. Fix encoding issue.
This commit is contained in:
commit
24ed97d920
@ -1,4 +1,6 @@
|
|||||||
rvm:
|
rvm:
|
||||||
|
- 1.8.7
|
||||||
- 1.9.2
|
- 1.9.2
|
||||||
- jruby
|
- jruby
|
||||||
|
- rbx
|
||||||
- ree
|
- ree
|
||||||
|
@ -57,7 +57,7 @@ class CompassTest < Test::Unit::TestCase
|
|||||||
assert_no_errors css_file, :blueprint
|
assert_no_errors css_file, :blueprint
|
||||||
end
|
end
|
||||||
each_sass_file do |sass_file|
|
each_sass_file do |sass_file|
|
||||||
assert_renders_correctly sass_file
|
assert_renders_correctly sass_file, :ignore_charset => true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user