diff options
Diffstat (limited to 'spec/requests/user_activity_spec.rb')
-rw-r--r-- | spec/requests/user_activity_spec.rb | 94 |
1 files changed, 1 insertions, 93 deletions
diff --git a/spec/requests/user_activity_spec.rb b/spec/requests/user_activity_spec.rb index 6f0726dbdc9..148bb2d6fae 100644 --- a/spec/requests/user_activity_spec.rb +++ b/spec/requests/user_activity_spec.rb @@ -3,18 +3,6 @@ require 'spec_helper' RSpec.describe 'Update of user activity' do - let(:user) { create(:user, last_activity_on: nil) } - - before do - group = create(:group, name: 'group') - project = create(:project, :public, namespace: group, name: 'project') - - create(:issue, project: project, iid: 10) - create(:merge_request, source_project: project, iid: 15) - - project.add_maintainer(user) - end - paths_to_visit = [ '/group', '/group/project', @@ -30,85 +18,5 @@ RSpec.describe 'Update of user activity' do '/group/project/-/merge_requests/15' ] - context 'without an authenticated user' do - it 'does not set the last activity cookie' do - get "/group/project" - - expect(response.cookies['user_last_activity_on']).to be_nil - end - end - - context 'with an authenticated user' do - before do - login_as(user) - end - - context 'with a POST request' do - it 'does not set the last activity cookie' do - post "/group/project/archive" - - expect(response.cookies['user_last_activity_on']).to be_nil - end - end - - paths_to_visit.each do |path| - context "on GET to #{path}" do - it 'updates the last activity date' do - expect(Users::ActivityService).to receive(:new).and_call_original - - get path - - expect(user.last_activity_on).to eq(Date.today) - end - - context 'when calling it twice' do - it 'updates last_activity_on just once' do - expect(Users::ActivityService).to receive(:new).once.and_call_original - - 2.times do - get path - end - end - end - - context 'when last_activity_on is nil' do - before do - user.update_attribute(:last_activity_on, nil) - end - - it 'updates the last activity date' do - expect(user.last_activity_on).to be_nil - - get path - - expect(user.last_activity_on).to eq(Date.today) - end - end - - context 'when last_activity_on is stale' do - before do - user.update_attribute(:last_activity_on, 2.days.ago.to_date) - end - - it 'updates the last activity date' do - get path - - expect(user.last_activity_on).to eq(Date.today) - end - end - - context 'when last_activity_on is up to date' do - before do - user.update_attribute(:last_activity_on, Date.today) - end - - it 'does not try to update it' do - expect(Users::ActivityService).not_to receive(:new) - - get path - end - end - end - end - end + it_behaves_like 'updating of user activity', paths_to_visit end |