2019-07-25 01:24:42 -04:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2016-09-13 22:43:25 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-06-16 14:09:01 -04:00
|
|
|
RSpec.describe 'Contributions Calendar', :js do
|
2020-02-07 04:08:49 -05:00
|
|
|
include MobileHelpers
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
let(:user) { create(:user) }
|
2017-08-24 05:20:04 -04:00
|
|
|
let(:contributed_project) { create(:project, :public, :repository) }
|
2017-01-26 12:59:50 -05:00
|
|
|
let(:issue_note) { create(:note, project: contributed_project) }
|
2016-09-13 22:43:25 -04:00
|
|
|
|
2016-10-01 13:18:44 -04:00
|
|
|
# Ex/ Sunday Jan 1, 2016
|
|
|
|
date_format = '%A %b %-d, %Y'
|
|
|
|
|
2016-09-19 17:04:19 -04:00
|
|
|
issue_title = 'Bug in old browser'
|
|
|
|
issue_params = { title: issue_title }
|
|
|
|
|
|
|
|
def get_cell_color_selector(contributions)
|
2017-11-24 17:01:01 -05:00
|
|
|
activity_colors = ["#ededed", "rgb(172, 213, 242)", "rgb(127, 168, 201)", "rgb(82, 123, 160)", "rgb(37, 78, 119)"]
|
2017-01-26 12:59:50 -05:00
|
|
|
# We currently don't actually test the cases with contributions >= 20
|
|
|
|
activity_colors_index =
|
|
|
|
if contributions > 0 && contributions < 10
|
|
|
|
1
|
|
|
|
elsif contributions >= 10 && contributions < 20
|
|
|
|
2
|
|
|
|
elsif contributions >= 20 && contributions < 30
|
|
|
|
3
|
|
|
|
elsif contributions >= 30
|
|
|
|
4
|
|
|
|
else
|
|
|
|
0
|
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
".user-contrib-cell[fill='#{activity_colors[activity_colors_index]}']"
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def get_cell_date_selector(contributions, date)
|
2017-01-26 12:59:50 -05:00
|
|
|
contribution_text =
|
2020-08-04 14:09:49 -04:00
|
|
|
if contributions == 0
|
2017-01-26 12:59:50 -05:00
|
|
|
'No contributions'
|
|
|
|
else
|
|
|
|
"#{contributions} #{'contribution'.pluralize(contributions)}"
|
|
|
|
end
|
2016-09-13 22:43:25 -04:00
|
|
|
|
2020-10-20 14:08:54 -04:00
|
|
|
"#{get_cell_color_selector(contributions)}[title='#{contribution_text}<br />#{date}']"
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def push_code_contribution
|
Migrate events into a new format
This commit migrates events data in such a way that push events are
stored much more efficiently. This is done by creating a shadow table
called "events_for_migration", and a table called "push_event_payloads"
which is used for storing push data of push events. The background
migration in this commit will copy events from the "events" table into
the "events_for_migration" table, push events in will also have a row
created in "push_event_payloads".
This approach allows us to reclaim space in the next release by simply
swapping the "events" and "events_for_migration" tables, then dropping
the old events (now "events_for_migration") table.
The new table structure is also optimised for storage space, and does
not include the unused "title" column nor the "data" column (since this
data is moved to "push_event_payloads").
== Newly Created Events
Newly created events are inserted into both "events" and
"events_for_migration", both using the exact same primary key value. The
table "push_event_payloads" in turn has a foreign key to the _shadow_
table. This removes the need for recreating and validating the foreign
key after swapping the tables. Since the shadow table also has a foreign
key to "projects.id" we also don't have to worry about orphaned rows.
This approach however does require some additional storage as we're
duplicating a portion of the events data for at least 1 release. The
exact amount is hard to estimate, but for GitLab.com this is expected to
be between 10 and 20 GB at most. The background migration in this commit
deliberately does _not_ update the "events" table as doing so would put
a lot of pressure on PostgreSQL's auto vacuuming system.
== Supporting Both Old And New Events
Application code has also been adjusted to support push events using
both the old and new data formats. This is done by creating a PushEvent
class which extends the regular Event class. Using Rails' Single Table
Inheritance system we can ensure the right class is used for the right
data, which in this case is based on the value of `events.action`. To
support displaying old and new data at the same time the PushEvent class
re-defines a few methods of the Event class, falling back to their
original implementations for push events in the old format.
Once all existing events have been migrated the various push event
related methods can be removed from the Event model, and the calls to
`super` can be removed from the methods in the PushEvent model.
The UI and event atom feed have also been slightly changed to better
handle this new setup, fortunately only a few changes were necessary to
make this work.
== API Changes
The API only displays push data of events in the new format. Supporting
both formats in the API is a bit more difficult compared to the UI.
Since the old push data was not really well documented (apart from one
example that used an incorrect "action" nmae) I decided that supporting
both was not worth the effort, especially since events will be migrated
in a few days _and_ new events are created in the correct format.
2017-07-10 11:43:57 -04:00
|
|
|
event = create(:push_event, project: contributed_project, author: user)
|
|
|
|
|
|
|
|
create(:push_event_payload,
|
|
|
|
event: event,
|
|
|
|
commit_from: '11f9ac0a48b62cef25eedede4c1819964f08d5ce',
|
|
|
|
commit_to: '1cf19a015df3523caf0a1f9d40c98a267d6a2fc2',
|
|
|
|
commit_count: 3,
|
|
|
|
ref: 'master')
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
2016-09-13 22:43:25 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
def note_comment_contribution
|
|
|
|
note_comment_params = {
|
|
|
|
project: contributed_project,
|
2020-05-28 11:08:02 -04:00
|
|
|
action: :commented,
|
2017-01-26 12:59:50 -05:00
|
|
|
target: issue_note,
|
|
|
|
author_id: user.id
|
|
|
|
}
|
2016-09-21 12:34:16 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
Event.create(note_comment_params)
|
2016-09-13 22:43:25 -04:00
|
|
|
end
|
|
|
|
|
2017-11-02 14:54:05 -04:00
|
|
|
def selected_day_activities(visible: true)
|
2018-11-20 03:37:33 -05:00
|
|
|
find('#js-overview .user-calendar-activities', visible: visible).text
|
2016-09-13 22:43:25 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
before do
|
2017-06-21 19:44:10 -04:00
|
|
|
sign_in user
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
2016-09-21 12:34:16 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe 'calendar day selection' do
|
2016-09-21 12:34:16 -04:00
|
|
|
before do
|
2017-01-26 12:59:50 -05:00
|
|
|
visit user.username
|
2018-11-20 03:37:33 -05:00
|
|
|
page.find('.js-overview-tab a').click
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2016-09-21 12:34:16 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
it 'displays calendar' do
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview')).to have_css('.js-contrib-calendar')
|
2016-09-21 12:34:16 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe 'select calendar day' do
|
2018-11-20 03:37:33 -05:00
|
|
|
let(:cells) { page.all('#js-overview .user-contrib-cell') }
|
2017-01-26 12:59:50 -05:00
|
|
|
|
2016-09-21 12:34:16 -04:00
|
|
|
before do
|
2017-01-26 12:59:50 -05:00
|
|
|
cells[0].click
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-01-26 12:59:50 -05:00
|
|
|
@first_day_activities = selected_day_activities
|
2016-09-21 12:34:16 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
it 'displays calendar day activities' do
|
|
|
|
expect(selected_day_activities).not_to be_empty
|
2016-09-21 12:34:16 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe 'select another calendar day' do
|
|
|
|
before do
|
|
|
|
cells[1].click
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'displays different calendar day activities' do
|
|
|
|
expect(selected_day_activities).not_to eq(@first_day_activities)
|
|
|
|
end
|
2016-09-21 12:34:16 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe 'deselect calendar day' do
|
|
|
|
before do
|
|
|
|
cells[0].click
|
2018-11-20 03:37:33 -05:00
|
|
|
page.find('.js-overview-tab a').click
|
2017-05-17 14:25:13 -04:00
|
|
|
wait_for_requests
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'hides calendar day activities' do
|
2017-11-02 14:54:05 -04:00
|
|
|
expect(selected_day_activities(visible: false)).to be_empty
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
2016-09-21 12:34:16 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-02-07 04:08:49 -05:00
|
|
|
shared_context 'visit user page' do
|
|
|
|
before do
|
|
|
|
visit user.username
|
|
|
|
page.find('.js-overview-tab a').click
|
|
|
|
wait_for_requests
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
2020-02-07 04:08:49 -05:00
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2020-02-07 04:08:49 -05:00
|
|
|
describe 'calendar daily activities' do
|
2017-01-26 12:59:50 -05:00
|
|
|
shared_examples 'a day with activity' do |contribution_count:|
|
|
|
|
include_context 'visit user page'
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it 'displays calendar activity square for 1 contribution', :sidekiq_might_not_need_inline do
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview')).to have_selector(get_cell_color_selector(contribution_count), count: 1)
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
today = Date.today.strftime(date_format)
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview')).to have_selector(get_cell_date_selector(contribution_count, today), count: 1)
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe '1 issue creation calendar activity' do
|
|
|
|
before do
|
|
|
|
Issues::CreateService.new(contributed_project, user, issue_params).execute
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
it_behaves_like 'a day with activity', contribution_count: 1
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe 'issue title is shown on activity page' do
|
|
|
|
include_context 'visit user page'
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it 'displays calendar activity log', :sidekiq_might_not_need_inline do
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview .overview-content-list .event-target-title')).to have_content issue_title
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
2016-09-13 22:43:25 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe '1 comment calendar activity' do
|
|
|
|
before do
|
|
|
|
note_comment_contribution
|
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
it_behaves_like 'a day with activity', contribution_count: 1
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe '10 calendar activities' do
|
|
|
|
before do
|
|
|
|
10.times { push_code_contribution }
|
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
it_behaves_like 'a day with activity', contribution_count: 10
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
|
|
|
|
2017-01-26 12:59:50 -05:00
|
|
|
describe 'calendar activity on two days' do
|
|
|
|
before do
|
|
|
|
push_code_contribution
|
|
|
|
|
2020-10-02 08:09:03 -04:00
|
|
|
travel_to(Date.yesterday) do
|
2017-01-26 12:59:50 -05:00
|
|
|
Issues::CreateService.new(contributed_project, user, issue_params).execute
|
|
|
|
end
|
|
|
|
end
|
|
|
|
include_context 'visit user page'
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it 'displays calendar activity squares for both days', :sidekiq_might_not_need_inline do
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview')).to have_selector(get_cell_color_selector(1), count: 2)
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
|
|
|
|
2019-10-23 05:06:03 -04:00
|
|
|
it 'displays calendar activity square for yesterday', :sidekiq_might_not_need_inline do
|
2017-01-26 12:59:50 -05:00
|
|
|
yesterday = Date.yesterday.strftime(date_format)
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview')).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'displays calendar activity square for today' do
|
|
|
|
today = Date.today.strftime(date_format)
|
2018-11-20 03:37:33 -05:00
|
|
|
expect(find('#js-overview')).to have_selector(get_cell_date_selector(1, today), count: 1)
|
2017-01-26 12:59:50 -05:00
|
|
|
end
|
2016-09-19 17:04:19 -04:00
|
|
|
end
|
2016-09-13 22:43:25 -04:00
|
|
|
end
|
2020-02-07 04:08:49 -05:00
|
|
|
|
|
|
|
describe 'on smaller screens' do
|
|
|
|
shared_examples 'hidden activity calendar' do
|
|
|
|
include_context 'visit user page'
|
|
|
|
|
|
|
|
it 'hides the activity calender' do
|
|
|
|
expect(find('#js-overview')).not_to have_css('.js-contrib-calendar')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'size xs' do
|
|
|
|
before do
|
|
|
|
resize_screen_xs
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'hidden activity calendar'
|
|
|
|
end
|
|
|
|
end
|
2016-09-13 22:43:25 -04:00
|
|
|
end
|