Removed web_steps.rb references from step definitions

Rhys Powell · Rhys Powell · commit 2db97cf2277f · 2011-11-22T15:47:00.000+11:00
diff --git a/Gemfile b/Gemfile
@@ -49,6 +49,7 @@ group :production do
 end
 
 group :test do
+  gem "capybara"
   gem "mocha"
   gem "database_cleaner"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -234,6 +234,7 @@ PLATFORMS
 DEPENDENCIES
   bson_ext
   cancan
+  capybara
   coffee-rails (~> 3.1.0)
   cucumber-rails
   database_cleaner
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
@@ -16,13 +16,13 @@
 
 Given /^I am signed up as "(.*)\/(.*)"$/ do |username, password|
   step %{I am not logged in}
-  step %{I go to the sign up page}
-  step %{I fill in "Username" with "#{username}"}
-  step %{I fill in "Email" with "#{username}@example.com"}
-  step %{I fill in "Password" with "#{password}"}
-  step %{I fill in "Password confirmation" with "#{password}"}
-  step %{I press "Sign up"}
-  step %{I should see "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."}
+  visit(signup_path)
+  fill_in("Username", :with => username)
+  fill_in("Email", :with => "#{username}@example.com")
+  fill_in("Password", :with => password)
+  fill_in("Password confirmation", :with => password)
+  click_button("Sign up")
+  BROWSER.html.should include('signed up succesfully')
   step %{I am logout}
 end
 
@@ -40,22 +40,22 @@
 
 When /^I sign in as "(.*)\/(.*)"$/ do |username, password|
   step %{I am not logged in}
-  step %{I go to the sign in page}
-  step %{I fill in "Username" with "#{username}"}
-  step %{I fill in "Password" with "#{password}"}
-  step %{I press "Sign in"}
+  visit(login_path)
+  fill_in("Username", :with => username)
+  fill_in("Password", :with => password)
+  click_button("Sign in")
 end
 
 Then /^I should be signed in$/ do
-  step %{I should see "Signed in successfully."}
+  BROWSER.html.should include("Signed in")
 end
 
 When /^I return next time$/ do
-  step %{I go to the home page}
+  visit(root)
 end
 
 Then /^I should be signed out$/ do
-  step %{I should see "Sign up"}
-  step %{I should see "Login"}
-  step %{I should not see "Logout"}
+  BROWSER.html.should include("Sign up")
+  BROWSER.html.should include("Login")
+  BROWSER.html.should_not include("Logout")
 end
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
