From 723f4356b9a506ca6d3e546c6f667a6346e1770a Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Wed, 19 Aug 2009 23:33:42 -0400
Subject: [PATCH] Move rspec-rails integration code to
 webrat/integrations/rspec-rails

---
 lib/webrat/integrations/rspec-rails.rb | 10 ++++++++++
 lib/webrat/rspec-rails.rb              | 12 ++----------
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 lib/webrat/integrations/rspec-rails.rb

diff --git a/lib/webrat/integrations/rspec-rails.rb b/lib/webrat/integrations/rspec-rails.rb
new file mode 100644
index 0000000..d274987
--- /dev/null
+++ b/lib/webrat/integrations/rspec-rails.rb
@@ -0,0 +1,10 @@
+# Supports using the matchers in controller, helper, and view specs if you're
+# using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
+#
+#   require 'webrat/rspec-rails'
+#
+require "webrat/core/matchers"
+
+Spec::Runner.configure do |config|
+  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
+end
diff --git a/lib/webrat/rspec-rails.rb b/lib/webrat/rspec-rails.rb
index d274987..533eb02 100644
--- a/lib/webrat/rspec-rails.rb
+++ b/lib/webrat/rspec-rails.rb
@@ -1,10 +1,2 @@
-# Supports using the matchers in controller, helper, and view specs if you're
-# using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
-#
-#   require 'webrat/rspec-rails'
-#
-require "webrat/core/matchers"
-
-Spec::Runner.configure do |config|
-  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
-end
+warn("Requiring 'webrat/rspec-rails' is deprecated. Please require 'webrat/integrations/rspec-rails' instead")
+require "webrat/integrations/rspec-rails"
\ No newline at end of file