summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-06-21 20:53:22 +0000
committerMike Greiling <mike@pixelcog.com>2019-06-21 20:53:22 +0000
commitc8c03f1d249c81947ab53dec83d99be342e5440d (patch)
treec92f8ac9351a17cbc6571c7e51e752cbbd67e546 /spec/features
parent82f5d90e5d7c3135790d4d83d58b762a85af5293 (diff)
parentaebf867aeee6fd6b9c4f7766b412133cdecd177d (diff)
downloadgitlab-ce-c8c03f1d249c81947ab53dec83d99be342e5440d.tar.gz
Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' into 'master'
Resolve "Display in admin area if emails are verified or not" Closes #49814 See merge request gitlab-org/gitlab-ce!29669
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/admin/admin_users_spec.rb26
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 29545779a34..dafec29dfcc 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -419,6 +419,32 @@ describe "Admin::Users" do
end
end
end
+
+ describe 'Email verification status' do
+ let!(:secondary_email) do
+ create :email, email: 'secondary@example.com', user: user
+ end
+
+ it 'displays the correct status for an unverified email address' do
+ user.update(confirmed_at: nil, unconfirmed_email: user.email)
+ visit admin_user_path(user)
+
+ expect(page).to have_content("#{user.email} Unverified")
+
+ expect(page).to have_content("#{secondary_email.email} Unverified")
+ end
+
+ it 'displays the correct status for a verified email address' do
+ visit admin_user_path(user)
+ expect(page).to have_content("#{user.email} Verified")
+
+ secondary_email.confirm
+ expect(secondary_email.confirmed?).to be_truthy
+
+ visit admin_user_path(user)
+ expect(page).to have_content("#{secondary_email.email} Verified")
+ end
+ end
end
describe "GET /admin/users/:id/edit" do