summaryrefslogtreecommitdiff
path: root/spec/services/users
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-06 09:07:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-06 09:07:42 +0000
commit669c24d9276db9a73bbcea40aeab98273aae9e5e (patch)
tree9548cfccd841b4aae3703cdd1b5bf5c167d5a8dc /spec/services/users
parent13076511c60f62ce0f8baba22ca9b94755a7d3cb (diff)
downloadgitlab-ce-669c24d9276db9a73bbcea40aeab98273aae9e5e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/users')
-rw-r--r--spec/services/users/activity_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/users/activity_service_spec.rb b/spec/services/users/activity_service_spec.rb
index d8d2be87fd3..f477eee1dd6 100644
--- a/spec/services/users/activity_service_spec.rb
+++ b/spec/services/users/activity_service_spec.rb
@@ -7,7 +7,7 @@ describe Users::ActivityService do
let(:user) { create(:user, last_activity_on: last_activity_on) }
- subject { described_class.new(user, 'type') }
+ subject { described_class.new(user) }
describe '#execute', :clean_gitlab_redis_shared_state do
context 'when last activity is nil' do
@@ -40,7 +40,7 @@ describe Users::ActivityService do
let(:fake_object) { double(username: 'hello') }
it 'does not record activity' do
- service = described_class.new(fake_object, 'pull')
+ service = described_class.new(fake_object)
expect(service).not_to receive(:record_activity)