diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-01 14:55:39 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-02 16:59:06 +0000 |
| commit | 67c6d98a1bca8ff45f3cb62c9df4e59985890e86 (patch) | |
| tree | bdf1a9aed6b339c2ad360a975f97152f02af6374 | |
| parent | 3806c008228438d490ea576c9fb89102fa6ec972 (diff) | |
| download | gitlab-ce-67c6d98a1bca8ff45f3cb62c9df4e59985890e86.tar.gz | |
Fixed failing password tests
| -rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 2 | ||||
| -rw-r--r-- | features/steps/profile/profile.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index 76d3f433e4b..89aad5202fe 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -12,7 +12,7 @@ Change your password - unless @user.password_automatically_set? or recover your current one - = form_for @user, url: profile_password_path, method: :put do |f| + = form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f| -if @user.errors.any? .alert.alert-danger %ul diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index a60db1cb534..0c60328583a 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -64,7 +64,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps page.within '.update-password' do fill_in "user_password", with: "22233344" fill_in "user_password_confirmation", with: "22233344" - click_button "Save" + click_button "Save password" end end @@ -73,7 +73,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps fill_in "user_current_password", with: "12345678" fill_in "user_password", with: "22233344" fill_in "user_password_confirmation", with: "22233344" - click_button "Save" + click_button "Save password" end end @@ -82,7 +82,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps fill_in "user_current_password", with: "12345678" fill_in "user_password", with: "password" fill_in "user_password_confirmation", with: "confirmation" - click_button "Save" + click_button "Save password" end end |