Cleanup the way the tests switch Webrat modes

lib/webrat/rails.rb

@@ -1,4 +1,6 @@
 require "webrat"
+
+require "action_controller"
 require "action_controller/integration"
 
 module Webrat

spec/spec_helper.rb

@@ -7,12 +7,21 @@ begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end
 webrat_path = File.expand_path(File.dirname(__FILE__) + "/../lib/")
 $LOAD_PATH.unshift(webrat_path) unless $LOAD_PATH.include?(webrat_path)
 
-require "merb-core"
-require "webrat/merb"
-
 require "webrat"
 require File.expand_path(File.dirname(__FILE__) + "/fakes/test_session")
 
+module Webrat
+  @@previous_config = nil
+
+  def self.cache_config_for_test
+    @@previous_config = Webrat.configuration.clone
+  end
+
+  def self.reset_for_test
+    @@configuration = @@previous_config if @@previous_config
+  end
+end
+
 Spec::Runner.configure do |config|
   include Webrat::Methods
   
@@ -26,22 +35,15 @@ Spec::Runner.configure do |config|
     webrat_session.response_body = xml
   end
   
-end
+  config.before :each do
-
+    Webrat.cache_config_for_test
-module Webrat
-  @@previous_config = nil
-
-  def self.cache_config_for_test
-    @@previous_config = Webrat.configuration.clone
   end
   
-  def self.reset_for_test
+  config.after :each do
-    @@configuration = @@previous_config if @@previous_config
+    Webrat.reset_for_test
-  end
-  
-  class Configuration
-    def mode_for_test= (mode)
-      @mode = mode
-    end
   end
 end
+
+Webrat.configure do |config|
+  config.mode = :merb
+end

spec/webrat/core/configuration_spec.rb

@@ -4,14 +4,6 @@ describe Webrat::Configuration do
   predicate_matchers[:parse_with_nokogiri]  = :parse_with_nokogiri?
   predicate_matchers[:open_error_files]     = :open_error_files?
 
-  before do
-    Webrat.cache_config_for_test
-  end
-  
-  after do
-    Webrat.reset_for_test
-  end
-
   it "should have a mode" do
     Webrat.configuration.should respond_to(:mode)
   end

spec/webrat/core/session_spec.rb

@@ -87,12 +87,8 @@ describe Webrat::Session do
 
   describe "#request_page" do
     before(:each) do
-      Webrat.cache_config_for_test
       webrat_session = Webrat::Session.new
     end
-    after(:each) do
-      Webrat.reset_for_test
-    end
   
     it "should raise an error if the request is not a success" do
       webrat_session.stub!(:get)

spec/webrat/mechanize/mechanize_session_spec.rb

@@ -1,13 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Webrat::MechanizeSession" do
+require "webrat/mechanize"
-  before :all do
-    Webrat.cache_config_for_test
-    Webrat.configuration.mode = :mechanize
-  end
 
-  after :all do
+describe Webrat::MechanizeSession do
-    Webrat.reset_for_test
+  before :each do
+    Webrat.configuration.mode = :mechanize
   end
 
   before(:each) do

spec/webrat/merb/helper.rb

@@ -1,2 +0,0 @@
-require 'merb-core'
-require "webrat/merb"

spec/webrat/merb/indifferent_access_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-require File.expand_path(File.dirname(__FILE__) + "/helper")
 
 describe HashWithIndifferentAccess do
   it "should not update constructor when not a hash" do

spec/webrat/merb/merb_session_spec.rb

@@ -2,8 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 require "webrat/merb"
 
-describe Webrat::Session do
+describe Webrat::MerbSession do
-  
   it "should not pass empty params if data is and empty hash" do
     session = Webrat::MerbSession.new
     response = OpenStruct.new

spec/webrat/rails/attaches_file_spec.rb

@@ -1,7 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "attach_file" do
   before do
+    Webrat.configuration.mode = :rails
     @filename = __FILE__
     @uploaded_file = mock("uploaded file")
     ActionController::TestUploadedFile.stub!(:new => @uploaded_file)

spec/webrat/rails/helper.rb

@@ -1,10 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "active_support"
-
-silence_warnings do
-  require "action_controller"
-  require "action_controller/integration"
-end
-
-require "webrat/rails"
-Webrat.configuration.mode_for_test = :rails

spec/webrat/rails/rails_session_spec.rb

@@ -1,6 +1,12 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+require "webrat/rails"
 
 describe Webrat::RailsSession do
+  before do
+    Webrat.configuration.mode = :rails
+  end
+  
   it "should delegate response_body to the session response body" do
     response = mock("response", :body => "<html>")
     integration_session = mock("integration session", :response => response)