From 67d2b2acb3ec88e981f50aa4f4b8a86b9cc1b288 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 24 Oct 2016 16:26:41 -0500
Subject: replace jquery.cookie vendor script with js.cookie

---
 spec/javascripts/awards_handler_spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'spec/javascripts/awards_handler_spec.js')

diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
index 019ce3b0702..5ce7892c838 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/javascripts/awards_handler_spec.js
@@ -1,7 +1,7 @@
 
 /*= require awards_handler */
 /*= require jquery */
-/*= require jquery.cookie */
+/*= require js.cookie */
 /*= require ./fixtures/emoji_menu */
 
 (function() {
@@ -44,7 +44,7 @@
       spyOn(jQuery, 'get').and.callFake(function(req, cb) {
         return cb(window.emojiMenu);
       });
-      spyOn(jQuery, 'cookie');
+      spyOn(Cookies, 'set');
     });
     afterEach(function() {
       // restore original url root value
@@ -194,7 +194,7 @@
       it('should set a cookie with the correct default path', function() {
         gon.relative_url_root = '';
         awardsHandler.addEmojiToFrequentlyUsedList('sunglasses');
-        expect(jQuery.cookie)
+        expect(Cookies.set)
           .toHaveBeenCalledWith('frequently_used_emojis', 'sunglasses', {
             path: '/',
             expires: 365
@@ -204,7 +204,7 @@
       it('should set a cookie with the correct custom root path', function() {
         gon.relative_url_root = '/gitlab/subdir';
         awardsHandler.addEmojiToFrequentlyUsedList('alien');
-        expect(jQuery.cookie)
+        expect(Cookies.set)
           .toHaveBeenCalledWith('frequently_used_emojis', 'alien', {
             path: '/gitlab/subdir',
             expires: 365
-- 
cgit v1.2.1


From f8520f5d096a7b62649c7465491003b3317c5e75 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 24 Oct 2016 16:54:38 -0500
Subject: remove manual Cookie.set "path" option in favor of global setting

---
 spec/javascripts/awards_handler_spec.js | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'spec/javascripts/awards_handler_spec.js')

diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
index 5ce7892c838..f5e400a2e39 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/javascripts/awards_handler_spec.js
@@ -44,7 +44,6 @@
       spyOn(jQuery, 'get').and.callFake(function(req, cb) {
         return cb(window.emojiMenu);
       });
-      spyOn(Cookies, 'set');
     });
     afterEach(function() {
       // restore original url root value
@@ -190,28 +189,6 @@
         return expect($thumbsUpEmoji.data("original-title")).toBe('sam');
       });
     });
-    describe('::addEmojiToFrequentlyUsedList', function() {
-      it('should set a cookie with the correct default path', function() {
-        gon.relative_url_root = '';
-        awardsHandler.addEmojiToFrequentlyUsedList('sunglasses');
-        expect(Cookies.set)
-          .toHaveBeenCalledWith('frequently_used_emojis', 'sunglasses', {
-            path: '/',
-            expires: 365
-          })
-        ;
-      });
-      it('should set a cookie with the correct custom root path', function() {
-        gon.relative_url_root = '/gitlab/subdir';
-        awardsHandler.addEmojiToFrequentlyUsedList('alien');
-        expect(Cookies.set)
-          .toHaveBeenCalledWith('frequently_used_emojis', 'alien', {
-            path: '/gitlab/subdir',
-            expires: 365
-          })
-        ;
-      });
-    });
     describe('search', function() {
       return it('should filter the emoji', function() {
         $('.js-add-award').eq(0).click();
-- 
cgit v1.2.1