From 92565d3bc424e70ec1a69d0b01e09ae0f8f65907 Mon Sep 17 00:00:00 2001 From: Corey Donohoe Date: Wed, 18 Feb 2009 12:16:19 -0700 Subject: [PATCH] use application_environment in merb also --- lib/webrat/selenium.rb | 2 +- spec/private/selenium/selenium_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb index caec6ab..b00a93e 100644 --- a/lib/webrat/selenium.rb +++ b/lib/webrat/selenium.rb @@ -41,7 +41,7 @@ module Webrat exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s end when :merb - system("merb -d -p #{Webrat.configuration.application_port}") + system("merb -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}") else # rails system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &") end diff --git a/spec/private/selenium/selenium_spec.rb b/spec/private/selenium/selenium_spec.rb index 574487f..c4fe946 100644 --- a/spec/private/selenium/selenium_spec.rb +++ b/spec/private/selenium/selenium_spec.rb @@ -21,7 +21,7 @@ describe Webrat, "Selenium" do describe "merb" do it "should start the app server with correct config options" do Webrat.configuration.application_framework = :merb - Webrat.should_receive(:system).with("merb -d -p #{Webrat.configuration.application_port}") + Webrat.should_receive(:system).with("merb -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}") TCPSocket.should_receive(:wait_for_service).with(:host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i) Webrat.start_app_server end