Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 4 deletions

diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_time_tracker_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_time_tracker_spec.js
index 5c435643425..e2e4baefad0 100644
--- a/spec/frontend/boards/components/sidebar/board_sidebar_time_tracker_spec.js
+++ b/spec/frontend/boards/components/sidebar/board_sidebar_time_tracker_spec.js
@@ -42,13 +42,20 @@ describe('BoardSidebarTimeTracker', () => {
     wrapper = null;
   });
 
-  it.each([[true], [false]])(
-    'renders IssuableTimeTracker with correct spent and estimated time (timeTrackingLimitToHours=%s)',
-    (timeTrackingLimitToHours) => {
-      createComponent({ provide: { timeTrackingLimitToHours } });
+  it.each`
+    timeTrackingLimitToHours | canUpdate
+    ${true}                  | ${false}
+    ${true}                  | ${true}
+    ${false}                 | ${false}
+    ${false}                 | ${true}
+  `(
+    'renders IssuableTimeTracker with correct spent and estimated time (timeTrackingLimitToHours=$timeTrackingLimitToHours, canUpdate=$canUpdate)',
+    ({ timeTrackingLimitToHours, canUpdate }) => {
+      createComponent({ provide: { timeTrackingLimitToHours, canUpdate } });
 
       expect(wrapper.findComponent(IssuableTimeTracker).props()).toEqual({
         limitToHours: timeTrackingLimitToHours,
+        canAddTimeEntries: canUpdate,
         showCollapsed: false,
         issuableId: '1',
         issuableIid: '1',