From 69dfa5022a388fe632a3db553e76942e5254dd3a Mon Sep 17 00:00:00 2001
From: Corey Donohoe <atmos@atmos.org>
Date: Sun, 15 Feb 2009 14:40:17 -0700
Subject: [PATCH] Webrat.configuration.application_type =>
 Webrat.configuration.application_framework

---
 lib/webrat/core/configuration.rb       |  4 ++--
 lib/webrat/selenium.rb                 |  8 +++-----
 spec/private/selenium/selenium_spec.rb | 12 ++++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/webrat/core/configuration.rb b/lib/webrat/core/configuration.rb
index 685a248..1fb3d4c 100755
--- a/lib/webrat/core/configuration.rb
+++ b/lib/webrat/core/configuration.rb
@@ -39,8 +39,8 @@ module Webrat
     webrat_deprecate :selenium_port, :application_port
     webrat_deprecate :selenium_port=, :application_port=
 
-    # Which underlying appserver are we testing with selenium
-    attr_accessor :application_type
+    # Which underlying app framework we're testing with selenium
+    attr_accessor :application_framework
 
     # Which server the application is running on for selenium testing? Defaults to localhost
     attr_accessor :application_address
diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb
index e45ac46..18f5e6b 100644
--- a/lib/webrat/selenium.rb
+++ b/lib/webrat/selenium.rb
@@ -34,16 +34,14 @@ module Webrat
   end
 
   def self.start_app_server #:nodoc:
-    case Webrat.configuration.application_type
+    case Webrat.configuration.application_framework
     when :sinatra
       fork do
         File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
         exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
       end
     when :merb
-      fork do
-        exec 'merb', '-d', '-p', Webrat.configuration.application_port
-      end
+      system("merb -d -p #{Webrat.configuration.application_port}"
     else # rails
       system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
     end
@@ -51,7 +49,7 @@ module Webrat
   end
 
   def self.stop_app_server #:nodoc:
-    case Webrat.configuration.application_type
+    case Webrat.configuration.application_framework
     when :sinatra
       pid = File.read('rack.pid')
       system("kill -9 #{pid}")
diff --git a/spec/private/selenium/selenium_spec.rb b/spec/private/selenium/selenium_spec.rb
index ae6c97b..e76a89a 100644
--- a/spec/private/selenium/selenium_spec.rb
+++ b/spec/private/selenium/selenium_spec.rb
@@ -8,7 +8,7 @@ RAILS_ROOT = "/"
 
 describe Webrat, "Selenium" do
   describe "start_app_server" do
-    after(:each) { Webrat.configuration.application_type = :rails }
+    after(:each) { Webrat.configuration.application_framework = :rails }
     describe "ruby on rails" do
       it "should start the app server with correct config options" do
         pid_file = "file"
@@ -20,7 +20,7 @@ describe Webrat, "Selenium" do
     end
     describe "merb" do
       it "should start the app server with correct config options" do
-        Webrat.configuration.application_type = :merb
+        Webrat.configuration.application_framework = :merb
         Webrat.should_receive(:fork)
 #        Kernel.should_receive(:exec).with(['merb', '-d', '-p', Webrat.configuration.application_port])
         TCPSocket.should_receive(:wait_for_service).with(:host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i)
@@ -30,7 +30,7 @@ describe Webrat, "Selenium" do
     describe "sinatra" do
       it "should start the app server with correct config options" do
         rackup_file = File.expand_path(Dir.pwd + '/config.ru')
-        Webrat.configuration.application_type = :sinatra
+        Webrat.configuration.application_framework = :sinatra
         Webrat.should_receive(:fork)
 #        Kernel.should_receive(:exec).with(['rackup', rackup_file, '-p', Webrat.configuration.application_port])
         TCPSocket.should_receive(:wait_for_service).with(:host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i)
@@ -40,7 +40,7 @@ describe Webrat, "Selenium" do
     end
   end
   describe "stop_app_server" do
-    after(:each) { Webrat.configuration.application_type = :rails }
+    after(:each) { Webrat.configuration.application_framework = :rails }
     describe "ruby on rails" do
       it "should stop the app server with correct config options" do
         pid_file = RAILS_ROOT+'/tmp/pids/mongrel_selenium.pid'
@@ -50,7 +50,7 @@ describe Webrat, "Selenium" do
     end
     describe "merb" do
       it "should stop the app server with correct config options" do
-        Webrat.configuration.application_type = :merb
+        Webrat.configuration.application_framework = :merb
         File.should_receive(:read).with('log/merb.3001.pid').and_return('666')
         Webrat.should_receive(:system).with("kill -9 666")
         Webrat.stop_app_server
@@ -58,7 +58,7 @@ describe Webrat, "Selenium" do
     end
     describe "sinatra" do
       it "should stop the app server with correct config options" do
-        Webrat.configuration.application_type = :sinatra
+        Webrat.configuration.application_framework = :sinatra
         File.should_receive(:read).with('rack.pid').and_return('666')
         Webrat.should_receive(:system).with("kill -9 666")
         Webrat.stop_app_server