Skip to content
代码片段 群组 项目
未验证 提交 efda2a7a 编辑于 作者: Cody West's avatar Cody West 提交者: Josianne Hyson
浏览文件

Apply review suggestions

上级 67d4689b
加载中
......@@ -21,17 +21,12 @@
end
shared_examples 'deactivates dormant users' do
it do
worker.perform
expect_any_instance_of(::Users::DeactivateService) do |deactivation_service|
expect(deactivation_service).to receive(:execute).twice.and_call_original
expect(deactivation_service).to have_received(:execute).with(dormant)
expect(deactivation_service).to have_received(:execute).with(inactive)
end
expect(dormant.reload).to be_deactivated
expect(inactive.reload).to be_deactivated
specify do
expect { worker.perform }
.to change { dormant.reload.state }
.to('deactivated')
.and change { inactive.reload.state }
.to('deactivated')
end
end
......@@ -50,15 +45,14 @@
end
with_them do
it do
specify do
user = create(:user, user_type: user_type, state: :active, last_activity_on: Gitlab::CurrentSettings.deactivate_dormant_users_period.days.ago.to_date)
worker.perform
expect_any_instance_of(::Users::DeactivateService) do |deactivation_service|
if expected_state == 'deactivated'
expect(deactivation_service).to receive(:execute).and_call_original
expect(deactivation_service).to have_received(:execute).with(user)
expect(deactivation_service).to receive(:execute).with(user).and_call_original
else
expect(deactivation_service).not_to have_received(:execute).with(user)
end
......@@ -70,7 +64,7 @@
end
shared_examples 'does not deactivate non-active users' do
it do
specify do
human_user = create(:user, user_type: :human, state: :blocked, last_activity_on: Gitlab::CurrentSettings.deactivate_dormant_users_period.days.ago.to_date)
service_user = create(:user, user_type: :service_user, state: :blocked, last_activity_on: Gitlab::CurrentSettings.deactivate_dormant_users_period.days.ago.to_date)
......@@ -84,7 +78,7 @@
end
shared_examples 'does not deactivate recently created users' do
it do
specify do
worker.perform
expect_any_instance_of(::Users::DeactivateService) do |deactivation_service|
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册