diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-06-23 10:39:56 +0200 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-06-23 10:39:56 +0200 |
commit | d12c1e90f8f3e9454d2a52f40854dadcdb2d822b (patch) | |
tree | 32746f28f3fcf81ffd3b81e4507ca4c32db9aabb | |
parent | 37425618bc5a15bb58ed6695d4932d309d452cb2 (diff) | |
download | gitlab-ce-d12c1e90f8f3e9454d2a52f40854dadcdb2d822b.tar.gz |
Test secondary user email removal.
-rw-r--r-- | app/views/admin/users/show.html.haml | 2 | ||||
-rw-r--r-- | features/admin/users.feature | 8 | ||||
-rw-r--r-- | features/steps/admin/users.rb | 19 |
3 files changed, 28 insertions, 1 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 0afae987a39..3c30ccd78b3 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -44,7 +44,7 @@ %li %span.light Secondary email: %strong= email.email - = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-tiny btn btn-remove pull-right", title: 'Remove secondary email' do + = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-tiny btn btn-remove pull-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do %i.icon-remove %li diff --git a/features/admin/users.feature b/features/admin/users.feature index ce31aafd290..d8c1288e5f0 100644 --- a/features/admin/users.feature +++ b/features/admin/users.feature @@ -21,3 +21,11 @@ Feature: Admin Users And click edit on my user When I submit modified user Then I see user attributes changed + +@javascript + Scenario: Remove users secondary email + Given I visit admin users page + And I view the user with secondary email + And I see the secondary email + When I click remove secondary email + Then I should not see secondary email anymore diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb index 659008dd875..253c4609e82 100644 --- a/features/steps/admin/users.rb +++ b/features/steps/admin/users.rb @@ -44,4 +44,23 @@ class AdminUsers < Spinach::FeatureSteps step 'click edit on my user' do find("#edit_user_#{current_user.id}").click end + + step 'I view the user with secondary email' do + @user_with_secondary_email = User.last + @user_with_secondary_email.emails.new(email: "secondary@example.com") + @user_with_secondary_email.save + visit "/admin/users/#{@user_with_secondary_email.username}" + end + + step 'I see the secondary email' do + page.should have_content "Secondary email: #{@user_with_secondary_email.emails.last.email}" + end + + step 'I click remove secondary email' do + find("#remove_email_#{@user_with_secondary_email.emails.last.id}").click + end + + step 'I should not see secondary email anymore' do + page.should_not have_content "Secondary email:" + end end |