Commit fd9fb0ba3fb74c3890f4813347c21543b1a24e97

Authored by Dan Croak
1 parent 56f3d2b0

get clearance features passing with new markup

app/views/sessions/new.html.erb
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 2
3 <% form_for :session, :url => session_path do |form| %> 3 <% form_for :session, :url => session_path do |form| %>
4 <fieldset class="inputs"> 4 <fieldset class="inputs">
5 - <%= form.string :email %> 5 + <%= form.string :email %>
6 <%= form.password :password %> 6 <%= form.password :password %>
7 - <%= form.password :password_confirmation %> 7 + <%= form.boolean :remember_me %>
8 </fieldset> 8 </fieldset>
9 <fieldset class="buttons"> 9 <fieldset class="buttons">
10 <%= form.submit "Sign in", :disable_with => "Please wait..." %> 10 <%= form.submit "Sign in", :disable_with => "Please wait..." %>
features/sign_up.feature
@@ -7,7 +7,7 @@ Feature: Sign up @@ -7,7 +7,7 @@ Feature: Sign up
7 When I go to the sign up page 7 When I go to the sign up page
8 And I fill in "Email" with "invalidemail" 8 And I fill in "Email" with "invalidemail"
9 And I fill in "Password" with "password" 9 And I fill in "Password" with "password"
10 - And I fill in "Confirm password" with "" 10 + And I fill in "Password confirmation" with ""
11 And I press "Sign Up" 11 And I press "Sign Up"
12 Then I should see error messages 12 Then I should see error messages
13 13
@@ -15,7 +15,7 @@ Feature: Sign up @@ -15,7 +15,7 @@ Feature: Sign up
15 When I go to the sign up page 15 When I go to the sign up page
16 And I fill in "Email" with "email@person.com" 16 And I fill in "Email" with "email@person.com"
17 And I fill in "Password" with "password" 17 And I fill in "Password" with "password"
18 - And I fill in "Confirm password" with "password" 18 + And I fill in "Password confirmation" with "password"
19 And I press "Sign Up" 19 And I press "Sign Up"
20 Then I should see "instructions for confirming" 20 Then I should see "instructions for confirming"
21 And a confirmation message should be sent to "email@person.com" 21 And a confirmation message should be sent to "email@person.com"