From f95da2a1dabbbc59d3f3e5f7f1fe0c1da68966eb Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 4 Apr 2014 10:56:47 -0700 Subject: [PATCH] arbua jruby support --- middleman-core/lib/middleman-core/step_definitions.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/step_definitions.rb b/middleman-core/lib/middleman-core/step_definitions.rb index c5c7a8db..4c14b091 100644 --- a/middleman-core/lib/middleman-core/step_definitions.rb +++ b/middleman-core/lib/middleman-core/step_definitions.rb @@ -3,10 +3,11 @@ MIDDLEMAN_BIN_PATH = File.join(MIDDLEMAN_ROOT_PATH, 'bin') ENV['PATH'] = "#{MIDDLEMAN_BIN_PATH}#{File::PATH_SEPARATOR}#{ENV['PATH']}" require 'aruba/cucumber' +require 'aruba/jruby' require 'middleman-core/step_definitions/middleman_steps' require 'middleman-core/step_definitions/builder_steps' require 'middleman-core/step_definitions/server_steps' Before do - @aruba_timeout_seconds = 60 + @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 120 : 60 end