Permalink
Browse files

stop cucumber from complaining, load psych first for 1.9.3

  • Loading branch information...
1 parent 646fb45 commit e4ac010c9673662bbde9b5e9c1637e03f7d71428 @qrush qrush committed Nov 19, 2011
View
@@ -1,5 +1,6 @@
source 'http://rubygems.org'
+gem 'psych', '~> 1.2.2'
gem 'rails', '~> 3.0.10'
gem 'clearance'
View
@@ -133,6 +133,7 @@ GEM
method_source (~> 0.6.7)
ruby_parser (>= 2.3.1)
slop (~> 2.1.0)
+ psych (1.2.2)
rack (1.2.4)
rack-maintenance (0.3.0)
rack (>= 1.0)
@@ -232,6 +233,7 @@ DEPENDENCIES
paul_revere
pg
pry
+ psych (~> 1.2.2)
rack
rack-maintenance
rack-test
@@ -1,11 +1,15 @@
# General
Then /^I should see error messages$/ do
- Then %{I should see "errors prohibited"}
+ steps %{
+ Then I should see "errors prohibited"
+ }
end
Then /^I should see an error message$/ do
- Then %{I should see "error prohibited"}
+ steps %{
+ Then I should see "error prohibited"
+ }
end
Then /^I should see an email field$/ do
@@ -43,21 +47,29 @@
# Session
Then /^I should be signed in$/ do
- Then %{I should see "sign out"}
+ steps %{
+ Then I should see "sign out"
+ }
end
Then /^I should be signed out$/ do
- Then %{I should see "sign in"}
+ steps %{
+ Then I should see "sign in"
+ }
end
Given /^(?:I am|I have|I) signed in (?:with|as) "(.*)"$/ do |email|
- Given %{I am signed up as "#{email}"}
- And %{I sign in as "#{email}"}
+ steps %{
+ Given I am signed up as "#{email}"
+ And I sign in as "#{email}"
+ }
end
Given /^I sign in$/ do
email = Factory.next(:email)
- Given %{I have signed in with "#{email}"}
+ steps %{
+ Given I have signed in with "#{email}"
+ }
end
# Emails
@@ -87,10 +99,12 @@
# Actions
When /^I sign in (?:with|as) "(.*)"$/ do |email|
- When %{I go to the sign in page}
- And %{I fill in "Email" with "#{email}"}
- And %{I fill in "Password" with "password"}
- And %{I press "Sign in"}
+ steps %{
+ When I go to the sign in page
+ And I fill in "Email" with "#{email}"
+ And I fill in "Password" with "password"
+ And I press "Sign in"
+ }
end
When "I sign out" do
@@ -101,12 +115,16 @@
end
When /^I request password reset link to be sent to "(.*)"$/ do |email|
- When %{I go to the password reset request page}
- And %{I fill in "Email address" with "#{email}"}
- And %{I press "Reset password"}
+ steps %{
+ When I go to the password reset request page
+ And I fill in "Email address" with "#{email}"
+ And I press "Reset password"
+ }
end
When /^I update my password with "(.*)"$/ do |password|
- And %{I fill in "Password" with "#{password}"}
- And %{I press "Save this password"}
+ steps %{
+ When I fill in "Password" with "#{password}"
+ And I press "Save this password"
+ }
end
@@ -1,5 +1,7 @@
Given /^I have changed my email address to "([^\"]*)"$/ do |email|
- Given %{I am on my edit profile page}
- When %{I fill in "Email address" with "#{email}"}
- And %{I press "Update"}
+ steps %{
+ Given I am on my edit profile page
+ When I fill in "Email address" with "#{email}"
+ And I press "Update"
+ }
end
@@ -7,8 +7,10 @@
end
When /^I sign in (?:with|as) "(.*)" with "(.*)"$/ do |email, password|
- When %{I go to the sign in page}
- And %{I fill in "Email" with "#{email}"}
- And %{I fill in "Password" with "#{password}"}
- And %{I press "Sign in"}
+ steps %{
+ When I go to the sign in page
+ And I fill in "Email" with "#{email}"
+ And I fill in "Password" with "#{password}"
+ And I press "Sign in"
+ }
end
Binary file not shown.

0 comments on commit e4ac010

Please sign in to comment.