Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 13 deletions

diff --git a/spec/frontend/frequent_items/components/app_spec.js b/spec/frontend/frequent_items/components/app_spec.js
index ba989bf53ab..32c66c0d288 100644
--- a/spec/frontend/frequent_items/components/app_spec.js
+++ b/spec/frontend/frequent_items/components/app_spec.js
@@ -6,7 +6,7 @@ import { mountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import App from '~/frequent_items/components/app.vue';
 import FrequentItemsList from '~/frequent_items/components/frequent_items_list.vue';
-import { FREQUENT_ITEMS, HOUR_IN_MS } from '~/frequent_items/constants';
+import { FREQUENT_ITEMS, FIFTEEN_MINUTES_IN_MS } from '~/frequent_items/constants';
 import eventHub from '~/frequent_items/event_hub';
 import { createStore } from '~/frequent_items/store';
 import { getTopFrequentItems } from '~/frequent_items/utils';
@@ -200,15 +200,15 @@ describe('Frequent Items App Component', () => {
         ]);
       });
 
-      it('should increase frequency, when created an hour later', () => {
-        const hourLater = Date.now() + HOUR_IN_MS + 1;
+      it('should increase frequency, when created 15 minutes later', () => {
+        const fifteenMinutesLater = Date.now() + FIFTEEN_MINUTES_IN_MS + 1;
 
-        jest.spyOn(Date, 'now').mockReturnValue(hourLater);
-        createComponent({ currentItem: { ...TEST_PROJECT, lastAccessedOn: hourLater } });
+        jest.spyOn(Date, 'now').mockReturnValue(fifteenMinutesLater);
+        createComponent({ currentItem: { ...TEST_PROJECT, lastAccessedOn: fifteenMinutesLater } });
 
         expect(getStoredProjects()).toEqual([
           expect.objectContaining({
-            lastAccessedOn: hourLater,
+            lastAccessedOn: fifteenMinutesLater,
             frequency: 2,
           }),
         ]);
diff --git a/spec/frontend/frequent_items/utils_spec.js b/spec/frontend/frequent_items/utils_spec.js
index 8c3841558f4..33c655a6ffd 100644
--- a/spec/frontend/frequent_items/utils_spec.js
+++ b/spec/frontend/frequent_items/utils_spec.js
@@ -1,5 +1,5 @@
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
-import { HOUR_IN_MS, FREQUENT_ITEMS } from '~/frequent_items/constants';
+import { FIFTEEN_MINUTES_IN_MS, FREQUENT_ITEMS } from '~/frequent_items/constants';
 import {
   isMobile,
   getTopFrequentItems,
@@ -67,8 +67,8 @@ describe('Frequent Items utils spec', () => {
 
   describe('updateExistingFrequentItem', () => {
     const LAST_ACCESSED = 1497979281815;
-    const WITHIN_AN_HOUR = LAST_ACCESSED + HOUR_IN_MS;
-    const OVER_AN_HOUR = WITHIN_AN_HOUR + 1;
+    const WITHIN_FIFTEEN_MINUTES = LAST_ACCESSED + FIFTEEN_MINUTES_IN_MS;
+    const OVER_FIFTEEN_MINUTES = WITHIN_FIFTEEN_MINUTES + 1;
     const EXISTING_ITEM = Object.freeze({
       ...mockProject,
       frequency: 1,
@@ -76,10 +76,10 @@ describe('Frequent Items utils spec', () => {
     });
 
     it.each`
-      desc                                           | existingProps                    | newProps                              | expected
-      ${'updates item if accessed over an hour ago'} | ${{}}                            | ${{ lastAccessedOn: OVER_AN_HOUR }}   | ${{ lastAccessedOn: Date.now(), frequency: 2 }}
-      ${'does not update is accessed with an hour'}  | ${{}}                            | ${{ lastAccessedOn: WITHIN_AN_HOUR }} | ${{ lastAccessedOn: EXISTING_ITEM.lastAccessedOn, frequency: 1 }}
-      ${'updates if lastAccessedOn not found'}       | ${{ lastAccessedOn: undefined }} | ${{ lastAccessedOn: WITHIN_AN_HOUR }} | ${{ lastAccessedOn: Date.now(), frequency: 2 }}
+      desc                                              | existingProps                    | newProps                                      | expected
+      ${'updates item if accessed over 15 minutes ago'} | ${{}}                            | ${{ lastAccessedOn: OVER_FIFTEEN_MINUTES }}   | ${{ lastAccessedOn: Date.now(), frequency: 2 }}
+      ${'does not update is accessed with 15 minutes'}  | ${{}}                            | ${{ lastAccessedOn: WITHIN_FIFTEEN_MINUTES }} | ${{ lastAccessedOn: EXISTING_ITEM.lastAccessedOn, frequency: 1 }}
+      ${'updates if lastAccessedOn not found'}          | ${{ lastAccessedOn: undefined }} | ${{ lastAccessedOn: WITHIN_FIFTEEN_MINUTES }} | ${{ lastAccessedOn: Date.now(), frequency: 2 }}
     `('$desc', ({ existingProps, newProps, expected }) => {
       const newItem = {
         ...EXISTING_ITEM,