Resolve "Add new "Overview" tab on user profile page"

1 files changed, 12 insertions, 9 deletions

diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index f08946b0593..aa3ca8923ff 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -64,7 +64,7 @@ describe 'Contributions Calendar', :js do
   end
 
   def selected_day_activities(visible: true)
-    find('.user-calendar-activities', visible: visible).text
+    find('.tab-pane#activity .user-calendar-activities', visible: visible).text
   end
 
   before do
@@ -74,15 +74,16 @@ describe 'Contributions Calendar', :js do
   describe 'calendar day selection' do
     before do
       visit user.username
+      page.find('.js-activity-tab a').click
       wait_for_requests
     end
 
     it 'displays calendar' do
-      expect(page).to have_css('.js-contrib-calendar')
+      expect(find('.tab-pane#activity')).to have_css('.js-contrib-calendar')
     end
 
     describe 'select calendar day' do
-      let(:cells) { page.all('.user-contrib-cell') }
+      let(:cells) { page.all('.tab-pane#activity .user-contrib-cell') }
 
       before do
         cells[0].click
@@ -108,6 +109,7 @@ describe 'Contributions Calendar', :js do
       describe 'deselect calendar day' do
         before do
           cells[0].click
+          page.find('.js-activity-tab a').click
           wait_for_requests
         end
 
@@ -122,6 +124,7 @@ describe 'Contributions Calendar', :js do
     shared_context 'visit user page' do
       before do
         visit user.username
+        page.find('.js-activity-tab a').click
         wait_for_requests
       end
     end
@@ -130,12 +133,12 @@ describe 'Contributions Calendar', :js do
       include_context 'visit user page'
 
       it 'displays calendar activity square color for 1 contribution' do
-        expect(page).to have_selector(get_cell_color_selector(contribution_count), count: 1)
+        expect(find('.tab-pane#activity')).to have_selector(get_cell_color_selector(contribution_count), count: 1)
       end
 
       it 'displays calendar activity square on the correct date' do
         today = Date.today.strftime(date_format)
-        expect(page).to have_selector(get_cell_date_selector(contribution_count, today), count: 1)
+        expect(find('.tab-pane#activity')).to have_selector(get_cell_date_selector(contribution_count, today), count: 1)
       end
     end
 
@@ -150,7 +153,7 @@ describe 'Contributions Calendar', :js do
         include_context 'visit user page'
 
         it 'displays calendar activity log' do
-          expect(find('.content_list .event-note')).to have_content issue_title
+          expect(find('.tab-pane#activity .content_list .event-note')).to have_content issue_title
         end
       end
     end
@@ -182,17 +185,17 @@ describe 'Contributions Calendar', :js do
       include_context 'visit user page'
 
       it 'displays calendar activity squares for both days' do
-        expect(page).to have_selector(get_cell_color_selector(1), count: 2)
+        expect(find('.tab-pane#activity')).to have_selector(get_cell_color_selector(1), count: 2)
       end
 
       it 'displays calendar activity square for yesterday' do
         yesterday = Date.yesterday.strftime(date_format)
-        expect(page).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
+        expect(find('.tab-pane#activity')).to have_selector(get_cell_date_selector(1, yesterday), count: 1)
       end
 
       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)
+        expect(find('.tab-pane#activity')).to have_selector(get_cell_date_selector(1, today), count: 1)
       end
     end
   end