Permalink
Browse files

adds password_confirmation field to registration page

  • Loading branch information...
1 parent d979ac4 commit 40f53141843827678a584d015079281a04180b47 @fabianrbz fabianrbz committed Oct 11, 2012
@@ -39,4 +39,16 @@
max-width : 95%;
}
-}
+
+ form {
+ .control-label,
+ .controls {
+ margin-left : auto;
+ width : auto;
+ }
+
+ .controls {
+ float : right;
+ }
+ }
+}
@@ -50,6 +50,16 @@
<%= f.password_field :password, :placeholder => "••••••••", :title => t('registrations.new.enter_password'), :required => true, :pattern => "......+" %>
</div>
</div>
+
+ <div class="control-group">
+ <label class="control-label" for="user_password_confirmation">
+ <%= t('.password_confirmation') %>
+ </label>
+
+ <div class="controls">
+ <%= f.password_field :password_confirmation, :placeholder => "••••••••", :title => t('registrations.new.enter_password_again'), :required => true, :pattern => "......+" %>
+ </div>
+ </div>
<%= invite_hidden_tag(invite) %>
</fieldset>
@@ -687,6 +687,7 @@ en:
email: "EMAIL"
username: "USERNAME"
password: "PASSWORD"
+ password_confirmation: "PASSWORD CONFIRMATION"
continue: "Continue"
create:
success: "You've joined Diaspora!"
@@ -7,6 +7,7 @@ Feature: invitation acceptance
| user_username | ohai |
| user_email | woot@sweet.com |
| user_password | secret |
+ | user_password_confirmation | secret |
And I press "Continue"
Then I should be on the getting started page
And I should see "Well, hello there!"
@@ -24,6 +25,7 @@ Feature: invitation acceptance
| user_username | ohai |
| user_email | woot@sweet.com |
| user_password | secret |
+ | user_password_confirmation | secret |
And I press "Continue"
Then I should be on the getting started page
And I should see "Well, hello there!"
@@ -4,9 +4,10 @@ Feature: new user registration
Background:
When I go to the new user registration page
And I fill in the following:
- | user_username | ohai |
- | user_email | ohai@example.com |
- | user_password | secret |
+ | user_username | ohai |
+ | user_email | ohai@example.com |
+ | user_password | secret |
+ | user_password_confirmation | secret |
And I press "Continue"
Then I should be on the getting started page
And I should see "Well, hello there!" and "Who are you?" and "What are you into?"
@@ -209,6 +209,7 @@
step 'I fill in "user_username" with "ohai"'
step 'I fill in "user_email" with "ohai@example.com"'
step 'I fill in "user_password" with "secret"'
+ step 'I fill in "user_password_confirmation" with "secret"'
end
And /^I should be able to friend Alice$/ do

0 comments on commit 40f5314

Please sign in to comment.