diff options
author | Stan Hu <stanhu@gmail.com> | 2018-08-02 21:17:00 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-08-02 21:18:31 +0300 |
commit | 1436423a490fe9f4c1ee1ccb8ecaa6240eed2906 (patch) | |
tree | 96aeebc6a85639996b106282663de41c41a7966f /spec | |
parent | 93c7b6c51a49a1939a876f2510a69e59827ac816 (diff) |
Fix failing 500 errors when deploy tokens are used to clone
A DeployToken responds to `:username`, but it returns the username for the
token, not a User object. Don't attempt to log user activity in this case.
Closes gitlab-org/gitlab-ee#7080
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/users/activity_service_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/services/users/activity_service_spec.rb b/spec/services/users/activity_service_spec.rb index f20849e6924..719b4adf212 100644 --- a/spec/services/users/activity_service_spec.rb +++ b/spec/services/users/activity_service_spec.rb @@ -28,6 +28,18 @@ describe Users::ActivityService do end end + context 'when a bad object is passed' do + let(:fake_object) { double(username: 'hello') } + + it 'does not record activity' do + service = described_class.new(fake_object, 'pull') + + expect(service).not_to receive(:record_activity) + + service.execute + end + end + context 'when last activity is today' do let(:last_activity_on) { Date.today } |