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

brynary · Oct 18, 2008 · b8e76a1 · b8e76a1
1 parent 264b147
commit b8e76a1
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 68 deletions.
diff --git a/lib/boot_rails.rb b/lib/boot_rails.rb
diff --git a/lib/webrat.rb b/lib/webrat.rb
@@ -10,4 +10,4 @@ def self.root
 
 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)
diff --git a/lib/boot_merb.rb → lib/webrat/merb.rb b/lib/boot_merb.rb → lib/webrat/merb.rb
@@ -118,10 +118,10 @@ def cookies=(newcookies)
 #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")
 
 
 
diff --git a/lib/merb_support/indifferent_access.rb → lib/webrat/merb/indifferent_access.rb b/lib/merb_support/indifferent_access.rb → lib/webrat/merb/indifferent_access.rb
diff --git a/lib/merb_support/param_parser.rb → lib/webrat/merb/param_parser.rb b/lib/merb_support/param_parser.rb → lib/webrat/merb/param_parser.rb
diff --git a/lib/merb_support/support.rb → lib/webrat/merb/support.rb b/lib/merb_support/support.rb → lib/webrat/merb/support.rb
diff --git a/lib/merb_support/url_encoded_pair_parser.rb → lib/webrat/merb/url_encoded_pair_parser.rb b/lib/merb_support/url_encoded_pair_parser.rb → lib/webrat/merb/url_encoded_pair_parser.rb
diff --git a/spec/api/attaches_file_spec.rb b/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

diff --git a/spec/webrat/merb/helper.rb b/spec/webrat/merb/helper.rb
@@ -1,5 +1,4 @@
 require 'merb-core'
-require 'merb_stories'
 # module Merb
 #   module Test
 #     class RspecStory

diff --git a/test/helper_merb.rb b/test/helper_merb.rb
diff --git a/test/helper_rails.rb b/test/helper_rails.rb