Moved merb files to be more in line with current webrat layout

lib/boot_rails.rb

@@ -1,39 +0,0 @@
-module ActionController
-  module Integration
-    class Session
-      
-      unless instance_methods.include?("put_via_redirect")
-        include Webrat::RedirectActions
-      end
-
-      def current_page
-        @current_page ||= Webrat::Page.new(self)
-      end
-      
-      def current_page=(new_page)
-        @current_page = new_page
-      end
-      
-      # Issues a GET request for a page, follows any redirects, and verifies the final page
-      # load was successful.
-      #
-      # Example:
-      #   visits "/"
-      def visits(*args)
-        @current_page = Webrat::Page.new(self, *args)
-      end
-
-      def save_and_open_page
-        current_page.save_and_open
-      end
-      
-      [:reloads, :fills_in, :clicks_button, :selects, :chooses, :checks, :unchecks, :clicks_link, :clicks_link_within, :clicks_put_link, :clicks_get_link, :clicks_post_link, :clicks_delete_link].each do |method_name|
-        define_method(method_name) do |*args|
-          current_page.send(method_name, *args)
-        end
-      end
-      
-    end
-  end
-end
-

lib/webrat.rb

@@ -10,4 +10,4 @@ require "active_support"
 
 require File.dirname(__FILE__) + "/webrat/core"
 require File.dirname(__FILE__) + "/webrat/rails" if defined?(RAILS_ENV)
-require File.join(File.dirname(__FILE__), "boot_merb.rb") if defined?(Merb)
+require File.dirname(__FILE__) + "/webrat/merb" if defined?(Merb)

lib/webrat/merb.rb

@@ -118,10 +118,10 @@ end
 #here because we're only loaded in Test mode. 
 require 'strscan'
 require 'cgi'
-require File.join(File.dirname(__FILE__), "merb_support", "param_parser.rb")
-require File.join(File.dirname(__FILE__), "merb_support", "url_encoded_pair_parser.rb")
-require File.join(File.dirname(__FILE__), "merb_support", "indifferent_access.rb")
-require File.join(File.dirname(__FILE__), "merb_support", "support.rb")
+require File.join(File.dirname(__FILE__), "merb", "param_parser.rb")
+require File.join(File.dirname(__FILE__), "merb", "url_encoded_pair_parser.rb")
+require File.join(File.dirname(__FILE__), "merb", "indifferent_access.rb")
+require File.join(File.dirname(__FILE__), "merb", "support.rb")
 
 
 

spec/api/attaches_file_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-unless ENV["TEST_MODE"] == "merb"
+unless ENV["TEST_MODE"] == "merb" #TODO - Rob
 describe "attaches_file" do
   before do
     @session = Webrat::TestSession.new

spec/webrat/merb/helper.rb

@@ -1,5 +1,4 @@
 require 'merb-core'
-require 'merb_stories'
 # module Merb
 #   module Test
 #     class RspecStory

test/helper_merb.rb

@@ -1,11 +0,0 @@
-require 'merb-core'
-require 'merb_stories'
-module Merb
-  module Test
-    class RspecStory
-      def flunk(message)
-        raise message
-      end  
-    end
- end
-end

test/helper_rails.rb

@@ -1,11 +0,0 @@
-require "active_support"
-silence_warnings do
-  require "action_controller"
-  require "action_controller/integration"
-end
-
-class ActionController::Integration::Session
-  def flunk(message)
-    raise message
-  end
-end