fix gemfile conflict

Gemfile

@@ -13,18 +13,16 @@ gem 'cucumber', '~> 1.3'
 
 # Optional middleman dependencies, included for tests
 gem 'less', '2.3.0', require: false
-gem 'slim', '~> 2.0', require: false
-gem 'liquid', '~> 2.6', require: false
-gem 'stylus', '~> 1.0', require: false
-gem 'sinatra','~> 1.4', require: false
-gem 'asciidoctor', '~> 0.1', require: false
+gem 'slim', '>= 2.0', require: false
+gem 'liquid', '>= 2.6', require: false
+gem 'stylus', '>= 1.0', require: false
+gem 'sinatra', '>= 1.4', require: false
+gem 'redcarpet', '>= 3.1', require: false unless RUBY_ENGINE == 'jruby'
+gem 'asciidoctor', '>= 0.1', require: false
 
-# For less, since it doesn't use ExecJS (which also means less wont work on windows)
-gem 'therubyracer', platforms: :ruby
-gem 'therubyrhino', platforms: :jruby
-
-# Redcarpet doesn't work on JRuby
-gem 'redcarpet', '~> 3.1', require: false unless RUBY_ENGINE == 'jruby'
+# For less, note there is no compatible JS runtime for windows
+gem 'therubyracer', '>= 0.12', platforms: :ruby
+gem 'therubyrhino', '>= 2.0', platforms: :jruby
 
 # Code Quality
 gem 'rubocop', '~> 0.24', require: false

README.md

@@ -62,11 +62,13 @@ Additionally, up-to-date generated code documentation is available on [RubyDoc].
 
 ## Build & Dependency Status
 
-[![Gem Version](https://badge.fury.io/rb/middleman.png)][gem]
-[![Build Status](https://travis-ci.org/middleman/middleman.png)][travis]
-[![Code Coverage](https://coveralls.io/repos/middleman/middleman/badge.png)][coveralls]
-[![Dependency Status](https://gemnasium.com/middleman/middleman.png?travis)][gemnasium]
-[![Code Quality](https://codeclimate.com/github/middleman/middleman.png)][codeclimate]
+[![Gem Version](http://img.shields.io/gem/v/middleman.svg?style=flat)][gem]
+[![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)][license]
+[![Dependency Status](http://img.shields.io/gemnasium/middleman/middleman.svg?style=flat)][gemnasium]
+[![Build Status](http://img.shields.io/travis/middleman/middleman.svg?style=flat)][travis]
+[![Code Coverage](http://img.shields.io/coveralls/middleman/middleman.svg?style=flat)][coveralls]
+[![Code Quality](http://img.shields.io/codeclimate/github/middleman/middleman.svg?style=flat)][codeclimate]
+[![Gittip](http://img.shields.io/gittip/middleman.svg?style=flat)][gittip]
 
 ## Community
 
@@ -115,6 +117,7 @@ Copyright (c) 2010-2013 Thomas Reynolds. MIT Licensed, see [LICENSE] for details
 [coveralls]: https://coveralls.io/r/middleman/middleman
 [gemnasium]: https://gemnasium.com/middleman/middleman
 [codeclimate]: https://codeclimate.com/github/middleman/middleman
+[gittip]: https://www.gittip.com/middleman/
 [rubyinstaller]: http://rubyinstaller.org/
 [rubydoc]: http://rubydoc.info/github/middleman/middleman
 [LICENSE]: https://github.com/middleman/middleman/blob/master/LICENSE.md

middleman-core/features/gzip.feature

@@ -9,7 +9,7 @@ Feature: GZIP assets during build
       | build/javascripts/test.js.gz |
       | build/stylesheets/test.css |
       | build/stylesheets/test.css.gz |
-    And build/javascripts/test.js.gz should be binary
+    And the file "build/javascripts/test.js.gz" should be gzipped
 
   Scenario: Preview server doesn't change
     Given the Server is running at "gzip-app"

middleman-core/lib/middleman-core/step_definitions/builder_steps.rb

@@ -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

middleman-core/lib/middleman-core/step_definitions/server_steps.rb

@@ -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|