diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-09 20:37:26 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-09 20:37:26 +0300 |
| commit | 5e1a802b15af4ba991f9ed85a691f1a925cc0edf (patch) | |
| tree | 72afca9c9cbeff206e8a38302ffdb9c09827e7dd /spec/features/admin | |
| parent | 8265fe3954e225d58567878fd9200acbe84ad296 (diff) | |
| parent | 11aff97d88e32effe5d8e16caccb9d23b9a4995a (diff) | |
Merge branch 'remove_is_admin' into 'master'
Remove the `User#is_admin?` method
Closes #30584
See merge request !10520
Diffstat (limited to 'spec/features/admin')
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index c0807b8c507..f6c3bc6a58d 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -223,7 +223,7 @@ describe "Admin::Users", feature: true do it "changes user entry" do user.reload expect(user.name).to eq('Big Bang') - expect(user.is_admin?).to be_truthy + expect(user.admin?).to be_truthy expect(user.password_expires_at).to be <= Time.now end end |