1 files changed, 222 insertions, 103 deletions

diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index b2a29c88b68..97b0e6d5c48 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -47,12 +47,14 @@ RSpec.describe 'Contributions Calendar', :js, feature_category: :user_profile do
   def push_code_contribution
     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')
+    create(
+      :push_event_payload,
+      event: event,
+      commit_from: '11f9ac0a48b62cef25eedede4c1819964f08d5ce',
+      commit_to: '1cf19a015df3523caf0a1f9d40c98a267d6a2fc2',
+      commit_count: 3,
+      ref: 'master'
+    )
   end
 
   def note_comment_contribution
@@ -70,162 +72,279 @@ RSpec.describe 'Contributions Calendar', :js, feature_category: :user_profile do
     find('#js-overview .user-calendar-activities', visible: visible).text
   end
 
-  before do
-    stub_feature_flags(profile_tabs_vue: false)
-    sign_in user
-  end
-
-  describe 'calendar day selection' do
+  shared_context 'when user page is visited' do
     before do
       visit user.username
-      page.find('.js-overview-tab a').click
+      page.click_link('Overview')
       wait_for_requests
     end
+  end
 
-    it 'displays calendar' do
-      expect(find('#js-overview')).to have_css('.js-contrib-calendar')
+  context 'with `profile_tabs_vue` feature flag disabled' do
+    before do
+      stub_feature_flags(profile_tabs_vue: false)
+      sign_in user
     end
 
-    describe 'select calendar day' do
-      let(:cells) { page.all('#js-overview .user-contrib-cell') }
+    describe 'calendar day selection' do
+      include_context 'when user page is visited'
 
-      before do
-        cells[0].click
-        wait_for_requests
-        @first_day_activities = selected_day_activities
+      it 'displays calendar' do
+        expect(find('#js-overview')).to have_css('.js-contrib-calendar')
       end
 
-      it 'displays calendar day activities' do
-        expect(selected_day_activities).not_to be_empty
-      end
+      describe 'select calendar day' do
+        let(:cells) { page.all('#js-overview .user-contrib-cell') }
 
-      describe 'select another calendar day' do
         before do
-          cells[1].click
+          cells[0].click
           wait_for_requests
         end
 
-        it 'displays different calendar day activities' do
-          expect(selected_day_activities).not_to eq(@first_day_activities)
+        it 'displays calendar day activities' do
+          expect(selected_day_activities).not_to be_empty
         end
-      end
 
-      describe 'deselect calendar day' do
-        before do
-          cells[0].click
-          wait_for_requests
-          cells[0].click
+        describe 'select another calendar day' do
+          it 'displays different calendar day activities' do
+            first_day_activities = selected_day_activities
+
+            cells[1].click
+            wait_for_requests
+
+            expect(selected_day_activities).not_to eq(first_day_activities)
+          end
         end
 
-        it 'hides calendar day activities' do
-          expect(selected_day_activities(visible: false)).to be_empty
+        describe 'deselect calendar day' do
+          before do
+            cells[0].click
+            wait_for_requests
+            cells[0].click
+          end
+
+          it 'hides calendar day activities' do
+            expect(selected_day_activities(visible: false)).to be_empty
+          end
         end
       end
     end
-  end
 
-  shared_context 'visit user page' do
-    before do
-      visit user.username
-      page.find('.js-overview-tab a').click
-      wait_for_requests
-    end
-  end
+    describe 'calendar daily activities' do
+      shared_examples 'a day with activity' do |contribution_count:|
+        include_context 'when user page is visited'
 
-  describe 'calendar daily activities' do
-    shared_examples 'a day with activity' do |contribution_count:|
-      include_context 'visit user page'
+        it 'displays calendar activity square for 1 contribution', :sidekiq_inline do
+          expect(find('#js-overview')).to have_selector(get_cell_level_selector(contribution_count), count: 1)
 
-      it 'displays calendar activity square for 1 contribution', :sidekiq_might_not_need_inline do
-        expect(find('#js-overview')).to have_selector(get_cell_level_selector(contribution_count), count: 1)
+          today = Date.today.strftime(date_format)
+          expect(find('#js-overview')).to have_selector(get_cell_date_selector(contribution_count, today), count: 1)
+        end
+      end
+
+      describe '1 issue and 1 work item creation calendar activity' do
+        before do
+          Issues::CreateService.new(
+            container: contributed_project,
+            current_user: user,
+            params: issue_params,
+            spam_params: nil
+          ).execute
+          WorkItems::CreateService.new(
+            container: contributed_project,
+            current_user: user,
+            params: { title: 'new task' },
+            spam_params: nil
+          ).execute
+        end
 
-        today = Date.today.strftime(date_format)
-        expect(find('#js-overview')).to have_selector(get_cell_date_selector(contribution_count, today), count: 1)
+        it_behaves_like 'a day with activity', contribution_count: 2
+
+        describe 'issue title is shown on activity page' do
+          include_context 'when user page is visited'
+
+          it 'displays calendar activity log', :sidekiq_inline do
+            expect(all('#js-overview .overview-content-list .event-target-title').map(&:text)).to contain_exactly(
+              match(/#{issue_title}/),
+              match(/new task/)
+            )
+          end
+        end
       end
-    end
 
-    describe '1 issue and 1 work item creation calendar activity' do
-      before do
-        Issues::CreateService.new(container: contributed_project, current_user: user, params: issue_params, spam_params: nil).execute
-        WorkItems::CreateService.new(
-          container: contributed_project,
-          current_user: user,
-          params: { title: 'new task' },
-          spam_params: nil
-        ).execute
+      describe '1 comment calendar activity' do
+        before do
+          note_comment_contribution
+        end
+
+        it_behaves_like 'a day with activity', contribution_count: 1
+      end
+
+      describe '10 calendar activities' do
+        before do
+          10.times { push_code_contribution }
+        end
+
+        it_behaves_like 'a day with activity', contribution_count: 10
       end
 
-      it_behaves_like 'a day with activity', contribution_count: 2
+      describe 'calendar activity on two days' do
+        before do
+          push_code_contribution
+
+          travel_to(Date.yesterday) do
+            Issues::CreateService.new(
+              container: contributed_project,
+              current_user: user,
+              params: issue_params,
+              spam_params: nil
+            ).execute
+          end
+        end
+
+        include_context 'when user page is visited'
 
-      describe 'issue title is shown on activity page' do
-        include_context 'visit user page'
+        it 'displays calendar activity squares for both days', :sidekiq_inline do
+          expect(find('#js-overview')).to have_selector(get_cell_level_selector(1), count: 2)
+        end
+
+        it 'displays calendar activity square for yesterday', :sidekiq_inline do
+          yesterday = Date.yesterday.strftime(date_format)
+          expect(find('#js-overview')).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
+        end
 
-        it 'displays calendar activity log', :sidekiq_inline do
-          expect(all('#js-overview .overview-content-list .event-target-title').map(&:text)).to contain_exactly(
-            match(/#{issue_title}/),
-            match(/new task/)
-          )
+        it 'displays calendar activity square for today' do
+          today = Date.today.strftime(date_format)
+          expect(find('#js-overview')).to have_selector(get_cell_date_selector(1, today), count: 1)
         end
       end
     end
 
-    describe '1 comment calendar activity' do
-      before do
-        note_comment_contribution
+    describe 'on smaller screens' do
+      shared_examples 'hidden activity calendar' do
+        include_context 'when user page is visited'
+
+        it 'hides the activity calender' do
+          expect(find('#js-overview')).not_to have_css('.js-contrib-calendar')
+        end
       end
 
-      it_behaves_like 'a day with activity', contribution_count: 1
-    end
+      context 'when screen size is xs' do
+        before do
+          resize_screen_xs
+        end
 
-    describe '10 calendar activities' do
-      before do
-        10.times { push_code_contribution }
+        it_behaves_like 'hidden activity calendar'
       end
+    end
+  end
 
-      it_behaves_like 'a day with activity', contribution_count: 10
+  context 'with `profile_tabs_vue` feature flag enabled' do
+    before do
+      sign_in user
     end
 
-    describe 'calendar activity on two days' do
-      before do
-        push_code_contribution
+    include_context 'when user page is visited'
 
-        travel_to(Date.yesterday) do
-          Issues::CreateService.new(container: contributed_project, current_user: user, params: issue_params, spam_params: nil).execute
+    it 'displays calendar' do
+      expect(page).to have_css('[data-testid="contrib-calendar"]')
+    end
+
+    describe 'calendar daily activities' do
+      shared_examples 'a day with activity' do |contribution_count:|
+        include_context 'when user page is visited'
+
+        it 'displays calendar activity square for 1 contribution', :sidekiq_inline do
+          expect(page).to have_selector(get_cell_level_selector(contribution_count), count: 1)
+
+          today = Date.today.strftime(date_format)
+          expect(page).to have_selector(get_cell_date_selector(contribution_count, today), count: 1)
         end
       end
-      include_context 'visit user page'
 
-      it 'displays calendar activity squares for both days', :sidekiq_might_not_need_inline do
-        expect(find('#js-overview')).to have_selector(get_cell_level_selector(1), count: 2)
+      describe '1 issue and 1 work item creation calendar activity' do
+        before do
+          Issues::CreateService.new(
+            container: contributed_project,
+            current_user: user,
+            params: issue_params,
+            spam_params: nil
+          ).execute
+          WorkItems::CreateService.new(
+            container: contributed_project,
+            current_user: user,
+            params: { title: 'new task' },
+            spam_params: nil
+          ).execute
+        end
+
+        it_behaves_like 'a day with activity', contribution_count: 2
       end
 
-      it 'displays calendar activity square for yesterday', :sidekiq_might_not_need_inline do
-        yesterday = Date.yesterday.strftime(date_format)
-        expect(find('#js-overview')).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
+      describe '1 comment calendar activity' do
+        before do
+          note_comment_contribution
+        end
+
+        it_behaves_like 'a day with activity', contribution_count: 1
       end
 
-      it 'displays calendar activity square for today' do
-        today = Date.today.strftime(date_format)
-        expect(find('#js-overview')).to have_selector(get_cell_date_selector(1, today), count: 1)
+      describe '10 calendar activities' do
+        before do
+          10.times { push_code_contribution }
+        end
+
+        it_behaves_like 'a day with activity', contribution_count: 10
       end
-    end
-  end
 
-  describe 'on smaller screens' do
-    shared_examples 'hidden activity calendar' do
-      include_context 'visit user page'
+      describe 'calendar activity on two days' do
+        before do
+          push_code_contribution
+
+          travel_to(Date.yesterday) do
+            Issues::CreateService.new(
+              container: contributed_project,
+              current_user: user,
+              params: issue_params,
+              spam_params: nil
+            ).execute
+          end
+        end
+
+        include_context 'when user page is visited'
+
+        it 'displays calendar activity squares for both days', :sidekiq_inline do
+          expect(page).to have_selector(get_cell_level_selector(1), count: 2)
+        end
+
+        it 'displays calendar activity square for yesterday', :sidekiq_inline do
+          yesterday = Date.yesterday.strftime(date_format)
+          expect(page).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
+        end
 
-      it 'hides the activity calender' do
-        expect(find('#js-overview')).not_to have_css('.js-contrib-calendar')
+        it 'displays calendar activity square for today' do
+          today = Date.today.strftime(date_format)
+          expect(page).to have_selector(get_cell_date_selector(1, today), count: 1)
+        end
       end
     end
 
-    context 'size xs' do
-      before do
-        resize_screen_xs
+    describe 'on smaller screens' do
+      shared_examples 'hidden activity calendar' do
+        include_context 'when user page is visited'
+
+        it 'hides the activity calender' do
+          expect(page).not_to have_css('[data-testid="contrib-calendar"]')
+        end
       end
 
-      it_behaves_like 'hidden activity calendar'
+      context 'when screen size is xs' do
+        before do
+          resize_screen_xs
+        end
+
+        it_behaves_like 'hidden activity calendar'
+      end
     end
   end
 end