From 4e52bb206fd1f9a342eeb639750f31719738dadb Mon Sep 17 00:00:00 2001
From: David Leal <dgleal@gmail.com>
Date: Sat, 8 Nov 2008 20:06:50 +0000
Subject: [PATCH] Support Merb 1.0 webrat integration.

---
 .../templates/features/steps/common_webrat.rb  | 18 +++++++++---------
 lib/merb_cucumber/world/base.rb                |  8 ++++----
 lib/merb_cucumber/world/webrat.rb              |  5 +++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/generators/cucumber/templates/features/steps/common_webrat.rb b/lib/generators/cucumber/templates/features/steps/common_webrat.rb
index f34803b..a9ee734 100644
--- a/lib/generators/cucumber/templates/features/steps/common_webrat.rb
+++ b/lib/generators/cucumber/templates/features/steps/common_webrat.rb
@@ -2,37 +2,37 @@
 # http://github.com/brynary/webrat
 
 When /^I go to (.*)$/ do |path|
-  visits path
+  visit path
 end
 
 When /^I press "(.*)"$/ do |button|
-  clicks_button(button)
+  click_button(button)
 end
 
 When /^I follow "(.*)"$/ do |link|
-  clicks_link(link)
+  click_link(link)
 end
 
 When /^I fill in "(.*)" with "(.*)"$/ do |field, value|
-  fills_in(field, :with => value) 
+  fill_in(field, :with => value) 
 end
 
 When /^I select "(.*)" from "(.*)"$/ do |value, field|
-  selects(value, :from => field) 
+  select(value, :from => field) 
 end
 
 When /^I check "(.*)"$/ do |field|
-  checks(field) 
+  check(field) 
 end
 
 When /^I uncheck "(.*)"$/ do |field|
-  unchecks(field) 
+  uncheck(field) 
 end
 
 When /^I choose "(.*)"$/ do |field|
-  chooses(field)
+  choose(field)
 end
 
 When /^I attach the file at "(.*)" to "(.*)" $/ do |path, field|
-  attaches_file(field, path)
+  attach_file(field, path)
 end
diff --git a/lib/merb_cucumber/world/base.rb b/lib/merb_cucumber/world/base.rb
index 854428e..c8110f1 100644
--- a/lib/merb_cucumber/world/base.rb
+++ b/lib/merb_cucumber/world/base.rb
@@ -2,10 +2,10 @@ module Merb
   module Test
     module World
       module Base
-        include Merb::Test::Matchers
-        include Merb::Test::ControllerHelper
-        include Merb::Test::RouteHelper
-        include Merb::Test::ViewHelper
+        include ::Merb::Test::Matchers
+        include ::Merb::Test::ControllerHelper
+        include ::Merb::Test::RouteHelper
+        include ::Merb::Test::ViewHelper
       end
     end
   end
diff --git a/lib/merb_cucumber/world/webrat.rb b/lib/merb_cucumber/world/webrat.rb
index a1ea8a6..95a8f62 100644
--- a/lib/merb_cucumber/world/webrat.rb
+++ b/lib/merb_cucumber/world/webrat.rb
@@ -1,12 +1,13 @@
+require File.join(File.dirname(__FILE__), 'base')
 require 'webrat'
 require 'webrat/merb'
-require File.join(File.dirname(__FILE__), 'base')
 
 module Merb
   module Test
     module World
-      class Webrat < ::Webrat::Session
+      class Webrat
         include Base
+        include ::Webrat::Methods
       end
     end
   end