update Cucumber features and steps top accommodate Devise confirmable

Author: DanielKehoe

features/step_definitions/user_steps.rb

@@ -1,22 +1,47 @@
 ### UTILITY METHODS ###
-def valid_user
-  @user ||= { :name => "Testy McUserton", :email => "testy@userton.com",
-    :password => "please", :password_confirmation => "please"}
+
+def create_visitor
+  @visitor ||= { :name => "Testy McUserton", :email => "example@example.com",
+    :password => "please", :password_confirmation => "please" }
+end
+
+def find_user
+  @user ||= User.first conditions: {:email => @visitor[:email]}
+end
+
+def create_unconfirmed_user
+  create_visitor
+  delete_user
+  sign_up
+  visit '/users/sign_out'
+end
+
+def create_user
+  create_visitor
+  delete_user
+  @user = FactoryGirl.create(:user, email: @visitor[:email])
 end
 
-def sign_up user
+def delete_user
+  @user ||= User.first conditions: {:email => @visitor[:email]}
+  @user.destroy unless @user.nil?
+end
+
+def sign_up
+  delete_user
   visit '/users/sign_up'
-  fill_in "Name", :with => user[:name]
-  fill_in "Email", :with => user[:email]
-  fill_in "Password", :with => user[:password]
-  fill_in "Password confirmation", :with => user[:password_confirmation]
+  fill_in "Name", :with => @visitor[:name]
+  fill_in "Email", :with => @visitor[:email]
+  fill_in "Password", :with => @visitor[:password]
+  fill_in "Password confirmation", :with => @visitor[:password_confirmation]
   click_button "Sign up"
+  find_user
 end
 
-def sign_in user
+def sign_in
   visit '/users/sign_in'
-  fill_in "Email", :with => user[:email]
-  fill_in "Password", :with => user[:password]
+  fill_in "Email", :with => @visitor[:email]
+  fill_in "Password", :with => @visitor[:password]
   click_button "Sign in"
 end
 
@@ -26,65 +51,80 @@ def sign_in user
 end
 
 Given /^I am logged in$/ do
-  sign_up valid_user
+  create_user
+  sign_in
 end
 
 Given /^I exist as a user$/ do
-  sign_up valid_user
-  visit '/users/sign_out'
+  create_user
 end
 
 Given /^I do not exist as a user$/ do
-  User.find(:first, :conditions => { :email => valid_user[:email] }).should be_nil
-  visit '/users/sign_out'
+  create_visitor
+  delete_user
+end
+
+Given /^I exist as an unconfirmed user$/ do
+  create_unconfirmed_user
 end
 
 ### WHEN ###
+When /^I sign in with valid credentials$/ do
+  create_visitor
+  sign_in
+end
+
 When /^I sign out$/ do
   visit '/users/sign_out'
 end
 
 When /^I sign up with valid user data$/ do
-  sign_up valid_user
+  create_visitor
+  sign_up
 end
 
 When /^I sign up with an invalid email$/ do
-  user = valid_user.merge(:email => "notanemail")
-  sign_up user
+  create_visitor
+  @visitor = @visitor.merge(:email => "notanemail")
+  sign_up
 end
 
-When /^I sign up without a confirmed password$/ do
-  user = valid_user.merge(:password_confirmation => "")
-  sign_up user
+When /^I sign up without a password confirmation$/ do
+  create_visitor
+  @visitor = @visitor.merge(:password_confirmation => "")
+  sign_up
 end
 
 When /^I sign up without a password$/ do
-  user = valid_user.merge(:password => "")
-  sign_up user
+  create_visitor
+  @visitor = @visitor.merge(:password => "")
+  sign_up
 end
 
 When /^I sign up with a mismatched password confirmation$/ do
-  user = valid_user.merge(:password_confirmation => "please123")
-  sign_up user
+  create_visitor
+  @visitor = @visitor.merge(:password_confirmation => "please123")
+  sign_up
 end
 
 When /^I return to the site$/ do
   visit '/'
 end
 
-When /^I sign in with a wrong password$/ do
-  user = valid_user.merge(:password => "wrongpass")
-  sign_in user
+When /^I sign in with a wrong email$/ do
+  @visitor = @visitor.merge(:email => "wrong@example.com")
+  sign_in
 end
 
-When /^I sign in with valid credentials$/ do
-  sign_in valid_user
+When /^I sign in with a wrong password$/ do
+  @visitor = @visitor.merge(:password => "wrongpass")
+  sign_in
 end
 
 When /^I edit my account details$/ do
   click_link "Edit account"
   fill_in "Name", :with => "newname"
-  fill_in "Current password", :with => valid_user[:password]
+  fill_in "Current password", :with => @visitor[:password]
   click_button "Update"
 end
 
@@ -105,8 +145,16 @@ def sign_in user
   page.should_not have_content "Logout"
 end
 
+Then /^I see an unconfirmed account message$/ do
+  page.should have_content "You have to confirm your account before continuing."
+end
+
+Then /^I see a successful sign in message$/ do
+  page.should have_content "Signed in successfully."
+end
+
 Then /^I should see a successful sign up message$/ do
-  page.should have_content "Welcome! You have signed up successfully."
+  page.should have_content "A message with a confirmation link has been sent to your email address."
 end
 
 Then /^I should see an invalid email message$/ do
@@ -126,21 +174,18 @@ def sign_in user
 end
 
 Then /^I should see a signed out message$/ do
-  page.should have_content "Signed out"
+  page.should have_content "Signed out successfully."
 end
 
 Then /^I see an invalid login message$/ do
   page.should have_content "Invalid email or password."
 end
 
-Then /^I see a successful sign in message$/ do
-  page.should have_content "Signed in successfully."
-end
-
 Then /^I should see an account edited message$/ do
   page.should have_content "You updated your account successfully."
 end
 
 Then /^I should see my name$/ do
-  page.should have_content valid_user[:name]
+  create_user
+  page.should have_content @user[:name]
 end

features/users/sign_in.feature

@@ -9,17 +9,26 @@ Feature: Sign in
       Then I see an invalid login message
         And I should be signed out
 
-    Scenario: User enters wrong password
-      Given I exist as a user
-        And I am not logged in
-      When I sign in with a wrong password
-      Then I see an invalid login message
-        And I should be signed out
-
-    Scenario: User signs in successfully with email
+    Scenario: User signs in successfully
       Given I exist as a user
         And I am not logged in
       When I sign in with valid credentials
       Then I see a successful sign in message
       When I return to the site
       Then I should be signed in
+
+    Scenario: User enters wrong email
+      Given I exist as a user
+      And I am not logged in
+      When I sign in with a wrong email
+      Then I see an invalid login message
+      And I should be signed out
+      
+    Scenario: User enters wrong password
+      Given I exist as a user
+      And I am not logged in
+      When I sign in with a wrong password
+      Then I see an invalid login message
+      And I should be signed out
+
+      

features/users/sign_up.feature

@@ -19,10 +19,9 @@ Feature: Sign up
       Then I should see a missing password message
 
     Scenario: User signs up without password confirmation
-      When I sign up without a confirmed password
+      When I sign up without a password confirmation
       Then I should see a missing password confirmation message
 
     Scenario: User signs up with mismatched password and confirmation
       When I sign up with a mismatched password confirmation
       Then I should see a mismatched password message
-

spec/factories.rb

@@ -1,8 +1,9 @@
-require 'factory_girl'
-
-Factory.define :user do |u|
-  u.name 'Test User'
-  u.email 'user@test.com'
-  u.password 'please'
-end
-
+FactoryGirl.define do
+  factory :user do
+    name 'Test User'
+    email 'example@example.com'
+    password 'please'
+    password_confirmation 'please'
+    confirmed_at Time.now unless Devise::Models::Confirmable.nil?
+  end
+end