Merge branch '3.0-stable'

This commit is contained in:
Ben Hollis 2013-02-10 16:54:02 -08:00
commit fede3449b6

View file

@ -1,13 +1,13 @@
require 'middleman-core/util' require 'middleman-core/util'
describe "Middleman::Util#binary?" do describe "Middleman::Util#binary?" do
%w(plain.txt unicode.txt unicode stars.svgz).each do |file| %w(plain.txt unicode.txt unicode).each do |file|
it "recognizes #{file} as not binary" do it "recognizes #{file} as not binary" do
Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_false Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_false
end end
end end
%w(middleman.png middleman).each do |file| %w(middleman.png middleman stars.svgz).each do |file|
it "recognizes #{file} as binary" do it "recognizes #{file} as binary" do
Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_true Middleman::Util.binary?(File.join(File.dirname(__FILE__), "binary_spec/#{file}")).should be_true
end end