diff options
author | Mike Greiling <mike@pixelcog.com> | 2016-10-24 16:26:41 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2016-10-24 18:09:00 -0500 |
commit | 67d2b2acb3ec88e981f50aa4f4b8a86b9cc1b288 (patch) | |
tree | 98ab53b9f40fca7ce370aa6ad82893ac697fa096 /spec/javascripts | |
parent | 5a4e6721786dd080cd40ca4ea23fc4202a85e73f (diff) | |
download | gitlab-ce-67d2b2acb3ec88e981f50aa4f4b8a86b9cc1b288.tar.gz |
replace jquery.cookie vendor script with js.cookie
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/activities_spec.js.es6 | 2 | ||||
-rw-r--r-- | spec/javascripts/awards_handler_spec.js | 8 | ||||
-rw-r--r-- | spec/javascripts/boards/boards_store_spec.js.es6 | 4 | ||||
-rw-r--r-- | spec/javascripts/boards/issue_spec.js.es6 | 2 | ||||
-rw-r--r-- | spec/javascripts/boards/list_spec.js.es6 | 2 | ||||
-rw-r--r-- | spec/javascripts/right_sidebar_spec.js | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6 index 743b15460c6..6699dee3cf7 100644 --- a/spec/javascripts/activities_spec.js.es6 +++ b/spec/javascripts/activities_spec.js.es6 @@ -1,4 +1,4 @@ -/*= require jquery.cookie.js */ +/*= require js.cookie.js */ /*= require jquery.endless-scroll.js */ /*= require pager */ /*= require activities */ 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 diff --git a/spec/javascripts/boards/boards_store_spec.js.es6 b/spec/javascripts/boards/boards_store_spec.js.es6 index 15c305ce321..8402a996192 100644 --- a/spec/javascripts/boards/boards_store_spec.js.es6 +++ b/spec/javascripts/boards/boards_store_spec.js.es6 @@ -1,6 +1,6 @@ //= require jquery //= require jquery_ujs -//= require jquery.cookie +//= require js.cookie //= require vue //= require vue-resource //= require lib/utils/url_utility @@ -17,7 +17,7 @@ gl.boardService = new BoardService('/test/issue-boards/board', '1'); gl.issueBoards.BoardsStore.create(); - $.cookie('issue_board_welcome_hidden', 'false'); + Cookies.set('issue_board_welcome_hidden', 'false'); }); describe('Store', () => { diff --git a/spec/javascripts/boards/issue_spec.js.es6 b/spec/javascripts/boards/issue_spec.js.es6 index 328c6f82ab5..cfece7ea7e8 100644 --- a/spec/javascripts/boards/issue_spec.js.es6 +++ b/spec/javascripts/boards/issue_spec.js.es6 @@ -1,6 +1,6 @@ //= require jquery //= require jquery_ujs -//= require jquery.cookie +//= require js.cookie //= require vue //= require vue-resource //= require lib/utils/url_utility diff --git a/spec/javascripts/boards/list_spec.js.es6 b/spec/javascripts/boards/list_spec.js.es6 index ec78d82e919..7b2c0945ce8 100644 --- a/spec/javascripts/boards/list_spec.js.es6 +++ b/spec/javascripts/boards/list_spec.js.es6 @@ -1,6 +1,6 @@ //= require jquery //= require jquery_ujs -//= require jquery.cookie +//= require js.cookie //= require vue //= require vue-resource //= require lib/utils/url_utility diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js index c937a4706f7..5aa8d5b5826 100644 --- a/spec/javascripts/right_sidebar_spec.js +++ b/spec/javascripts/right_sidebar_spec.js @@ -1,7 +1,7 @@ /*= require right_sidebar */ /*= require jquery */ -/*= require jquery.cookie */ +/*= require js.cookie */ (function() { var $aside, $icon, $labelsIcon, $page, $toggle, assertSidebarState; |