use application_environment in merb also

brynary · Feb 18, 2009 · 92565d3 · 92565d3
1 parent 4fb9406
commit 92565d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb
@@ -41,7 +41,7 @@ def self.start_app_server #:nodoc:
         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
@@ -21,7 +21,7 @@
     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