diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-31 21:14:49 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-31 21:14:49 +0000 |
commit | 82539cff700931532b22b6a8e3d6832137fc5d55 (patch) | |
tree | 9259e5161b5433c3e808831129b8db2a328981bc | |
parent | 1bb7a6c4abe9397ed6fe01f8dbbe45b03685c8f0 (diff) | |
parent | 340f1fc97652a9c7c39c5d124e5726f537780f3f (diff) | |
download | gitlab-ce-82539cff700931532b22b6a8e3d6832137fc5d55.tar.gz |
Merge branch 'clean-up-user-controller-spec' into 'master'
Minor clean up on admin/users_controller_spec
Extracted from !3439
See merge request !3460
-rw-r--r-- | spec/controllers/admin/users_controller_spec.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 5b1f65d7aff..9ef8ba1b097 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -1,15 +1,14 @@ require 'spec_helper' describe Admin::UsersController do - let(:admin) { create(:admin) } + let(:user) { create(:user) } before do - sign_in(admin) + sign_in(create(:admin)) end describe 'DELETE #user with projects' do - let(:user) { create(:user) } - let(:project) { create(:project, namespace: user.namespace) } + let(:project) { create(:empty_project, namespace: user.namespace) } before do project.team << [user, :developer] @@ -23,8 +22,6 @@ describe Admin::UsersController do end describe 'PUT block/:id' do - let(:user) { create(:user) } - it 'blocks user' do put :block, id: user.username user.reload @@ -50,8 +47,6 @@ describe Admin::UsersController do end context 'manually blocked users' do - let(:user) { create(:user) } - before do user.block end @@ -66,8 +61,6 @@ describe Admin::UsersController do end describe 'PUT unlock/:id' do - let(:user) { create(:user) } - before do request.env["HTTP_REFERER"] = "/" user.lock_access! @@ -95,8 +88,6 @@ describe Admin::UsersController do end describe 'PATCH disable_two_factor' do - let(:user) { create(:user) } - it 'disables 2FA for the user' do expect(user).to receive(:disable_two_factor!) allow(subject).to receive(:user).and_return(user) |