From 378ed0999bff9d5b8fa409676d08432938c1937b Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 27 Jul 2011 13:39:21 -0700 Subject: [PATCH] update deps, fix test runner --- features/step_definitions/middleman_steps.rb | 1 + middleman.gemspec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/features/step_definitions/middleman_steps.rb b/features/step_definitions/middleman_steps.rb index eda0869d..fc8bc5e0 100644 --- a/features/step_definitions/middleman_steps.rb +++ b/features/step_definitions/middleman_steps.rb @@ -17,6 +17,7 @@ end Given /^the Server is running$/ do @server ||= Middleman.server + @server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app") @browser = Rack::Test::Session.new(Rack::MockSession.new(@server.new)) end diff --git a/middleman.gemspec b/middleman.gemspec index 74275d8d..9cf3daaf 100644 --- a/middleman.gemspec +++ b/middleman.gemspec @@ -26,14 +26,14 @@ Gem::Specification.new do |s| s.add_runtime_dependency("sinatra", ["~> 1.2.6"]) s.add_runtime_dependency("padrino-core", ["~> 0.10.0"]) s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0"]) - s.add_runtime_dependency("rack-test", ["~> 0.5.0"]) - s.add_runtime_dependency("uglifier", ["~> 0.5.0"]) + s.add_runtime_dependency("rack-test", ["~> 0.6.1"]) + s.add_runtime_dependency("uglifier", ["~> 1.0.0"]) s.add_runtime_dependency("slim", ["~> 0.9.0"]) s.add_runtime_dependency("haml", ["~> 3.1.0"]) s.add_runtime_dependency("sass", ["~> 3.1.5"]) s.add_runtime_dependency("coffee-script", ["~> 2.2.0"]) s.add_runtime_dependency("compass", ["~> 0.11.3"]) - s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"]) + s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"]) s.add_runtime_dependency("httparty", ["~> 0.7.0"]) s.add_runtime_dependency("guard", ["~> 0.5.1"]) s.add_runtime_dependency("guard-livereload", ["~> 0.2.0"])