Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 6 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 c6bf35736c7..74441e147cf 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
@@ -26,7 +26,7 @@ describe('BoardSidebarTimeTracker', () => {
     store = createStore();
     store.state.boardItems = {
       1: {
-        id: 1,
+        iid: 1,
         timeEstimate: 3600,
         totalTimeSpent: 1800,
         humanTimeEstimate: '1h',
@@ -47,13 +47,16 @@ describe('BoardSidebarTimeTracker', () => {
       createComponent({ provide: { timeTrackingLimitToHours } });
 
       expect(wrapper.find(IssuableTimeTracker).props()).toEqual({
-        timeEstimate: 3600,
-        timeSpent: 1800,
-        humanTimeEstimate: '1h',
-        humanTimeSpent: '30min',
         limitToHours: timeTrackingLimitToHours,
         showCollapsed: false,
-        issuableId: '1',
+        issuableIid: '1',
+        fullPath: '',
+        initialTimeTracking: {
+          timeEstimate: 3600,
+          totalTimeSpent: 1800,
+          humanTimeEstimate: '1h',
+          humanTotalTimeSpent: '30min',
+        },
       });
     },
   );