Merge branch 'remove-cookies-global' into 'master'

Remove Cookies class from global space

See merge request !9883

3 files changed, 10 insertions, 11 deletions

diff --git a/spec/javascripts/boards/boards_store_spec.js b/spec/javascripts/boards/boards_store_spec.js
index a033ac04da6..e21f4ca2bc0 100644
--- a/spec/javascripts/boards/boards_store_spec.js
+++ b/spec/javascripts/boards/boards_store_spec.js
@@ -1,12 +1,12 @@
 /* eslint-disable comma-dangle, one-var, no-unused-vars */
 /* global BoardService */
 /* global boardsMockInterceptor */
-/* global Cookies */
 /* global listObj */
 /* global listObjDuplicate */
 /* global ListIssue */
 
 import Vue from 'vue';
+import Cookies from 'js-cookie';
 
 require('~/lib/utils/url_utility');
 require('~/boards/models/issue');
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 16df1ad4f28..15465588223 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -8,7 +8,6 @@ jasmine.getJSONFixtures().fixturesPath = 'base/spec/javascripts/fixtures';
 require('~/commons/index.js');
 window.$ = window.jQuery = require('jquery');
 window._ = require('underscore');
-window.Cookies = require('js-cookie');
 
 // stub expected globals
 window.gl = window.gl || {};
diff --git a/spec/javascripts/user_callout_spec.js b/spec/javascripts/user_callout_spec.js
index 205e72af600..2398149d3ad 100644
--- a/spec/javascripts/user_callout_spec.js
+++ b/spec/javascripts/user_callout_spec.js
@@ -1,7 +1,7 @@
-const UserCallout = require('~/user_callout');
+import Cookies from 'js-cookie';
+import UserCallout from '~/user_callout';
 
 const USER_CALLOUT_COOKIE = 'user_callout_dismissed';
-const Cookie = window.Cookies;
 
 describe('UserCallout', function () {
   const fixtureName = 'static/user_callout.html.raw';
@@ -9,7 +9,7 @@ describe('UserCallout', function () {
 
   beforeEach(() => {
     loadFixtures(fixtureName);
-    Cookie.remove(USER_CALLOUT_COOKIE);
+    Cookies.remove(USER_CALLOUT_COOKIE);
 
     this.userCallout = new UserCallout();
     this.closeButton = $('.close-user-callout');
@@ -18,25 +18,25 @@ describe('UserCallout', function () {
   });
 
   it('does not show when cookie is set not defined', () => {
-    expect(Cookie.get(USER_CALLOUT_COOKIE)).toBeUndefined();
+    expect(Cookies.get(USER_CALLOUT_COOKIE)).toBeUndefined();
     expect(this.userCalloutContainer.is(':visible')).toBe(true);
   });
 
   it('shows when cookie is set to false', () => {
-    Cookie.set(USER_CALLOUT_COOKIE, 'false');
+    Cookies.set(USER_CALLOUT_COOKIE, 'false');
 
-    expect(Cookie.get(USER_CALLOUT_COOKIE)).toBeDefined();
+    expect(Cookies.get(USER_CALLOUT_COOKIE)).toBeDefined();
     expect(this.userCalloutContainer.is(':visible')).toBe(true);
   });
 
   it('hides when user clicks on the dismiss-icon', () => {
     this.closeButton.click();
-    expect(Cookie.get(USER_CALLOUT_COOKIE)).toBe('true');
+    expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
   });
 
   it('hides when user clicks on the "check it out" button', () => {
     this.userCalloutBtn.click();
-    expect(Cookie.get(USER_CALLOUT_COOKIE)).toBe('true');
+    expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
   });
 });
 
@@ -46,7 +46,7 @@ describe('UserCallout when cookie is present', function () {
 
   beforeEach(() => {
     loadFixtures(fixtureName);
-    Cookie.set(USER_CALLOUT_COOKIE, 'true');
+    Cookies.set(USER_CALLOUT_COOKIE, 'true');
     this.userCallout = new UserCallout();
     this.userCalloutContainer = $('.user-callout');
   });