Make merb integration test load 'local' webrat, instead of the gem.

brynary · Dec 30, 2008 · 7044eb5 · 7044eb5 · foca · Dec 30, 2008
1 parent 7258ea3
commit 7044eb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/spec/integration/merb/config/environments/test.rb b/spec/integration/merb/config/environments/test.rb
@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + "/../../../../../lib/webrat"
+
 Merb.logger.info("Loaded TEST Environment...")
 Merb::Config.use { |c|
   c[:testing]           = true

diff --git a/spec/integration/merb/spec/spec_helper.rb b/spec/integration/merb/spec/spec_helper.rb
@@ -17,4 +17,8 @@
   config.include(Merb::Test::ViewHelper)
   config.include(Merb::Test::RouteHelper)
   config.include(Merb::Test::ControllerHelper)
+end
+
+Webrat.configure do |config|
+  config.mode = :merb
 end