deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix gemfile conflict

Browse source
This commit is contained in:
Eliott Appleford 2014-07-06 04:25:07 +01:00
commit a47b58c58d
5 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/step_definitions/builder_steps.rb
View file

@ -72,6 +72,6 @@ Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
check_file_content(file, partial_content, true)
end
And /(.*) should be binary/ do |file|
And /the file "(.*)" should be gzipped/ do |file|
expect(File.binread(File.join(current_dir, file), 2)).to eq(['1F8B'].pack('H*'))
end

2
middleman-core/lib/middleman-core/step_definitions/server_steps.rb
View file

@ -68,7 +68,7 @@ When /^I go to "([^\"]*)"$/ do |url|
end
Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
expect(lambda { @browser.get(URI.escape(url)) }).to_not raise_exception
expect{ @browser.get(URI.escape(url)) }.to_not raise_exception
end
Then /^the content type should be "([^\"]*)"$/ do |expected|