Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 4 deletions

diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index 5b33451962b..2c5b7d66e2f 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -143,18 +143,27 @@ RSpec.describe 'Contributions Calendar', :js, feature_category: :users do
       end
     end
 
-    describe '1 issue creation calendar activity' do
+    describe '1 issue and 1 work item creation calendar activity' do
       before do
         Issues::CreateService.new(project: contributed_project, current_user: user, params: issue_params, spam_params: nil).execute
+        WorkItems::CreateService.new(
+          project: contributed_project,
+          current_user: user,
+          params: { title: 'new task' },
+          spam_params: nil
+        ).execute
       end
 
-      it_behaves_like 'a day with activity', contribution_count: 1
+      it_behaves_like 'a day with activity', contribution_count: 2
 
       describe 'issue title is shown on activity page' do
         include_context 'visit user page'
 
-        it 'displays calendar activity log', :sidekiq_might_not_need_inline do
-          expect(find('#js-overview .overview-content-list .event-target-title')).to have_content issue_title
+        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