feat(cookies): use $cookies (1.4+) or $cookieStore (<1.4)

Solves #1061
angular-translate · Feb 11, 2017 · 51330f5 · 51330f5
1 parent d26d9ef
commit 51330f5
Show file tree

Hide file tree

Showing 2 changed files with 126 additions and 8 deletions.
diff --git a/src/service/storage-cookie.js b/src/service/storage-cookie.js
@@ -12,10 +12,34 @@ angular.module('pascalprecht.translate')
  */
   .factory('$translateCookieStorage', $translateCookieStorageFactory);
 
-function $translateCookieStorageFactory($cookieStore) {
+function $translateCookieStorageFactory($injector) {
 
   'use strict';
 
+  // Since AngularJS 1.4, $cookieStore is deprecated
+  var delegate;
+  if (angular.version.major === 1 && angular.version.minor >= 4) {
+    var $cookies = $injector.get('$cookies');
+    delegate = {
+      get : function (key) {
+        return $cookies.get(key);
+      },
+      put : function (key, value) {
+        $cookies.put(key, value);
+      }
+    };
+  } else {
+    var $cookieStore = $injector.get('$cookieStore');
+    delegate = {
+      get : function (key) {
+        return $cookieStore.get(key);
+      },
+      put : function (key, value) {
+        $cookieStore.put(key, value);
+      }
+    };
+  }
+
   var $translateCookieStorage = {
 
     /**
@@ -29,8 +53,8 @@ function $translateCookieStorageFactory($cookieStore) {
      * @param {string} name Item name
      * @return {string} Value of item name
      */
-    get: function (name) {
-      return $cookieStore.get(name);
+    get : function (name) {
+      return delegate.get(name);
     },
 
     /**
@@ -46,8 +70,8 @@ function $translateCookieStorageFactory($cookieStore) {
      * @param {string} name Item name
      * @param {string} value Item value
      */
-    set: function (name, value) {
-      $cookieStore.put(name, value);
+    set : function (name, value) {
+      delegate.put(name, value);
     },
 
     /**
@@ -61,8 +85,8 @@ function $translateCookieStorageFactory($cookieStore) {
      * @param {string} name Item name
      * @param {string} value Item value
      */
-    put: function (name, value) {
-      $cookieStore.put(name, value);
+    put : function (name, value) {
+      delegate.put(name, value);
     }
   };
 

diff --git a/test/unit/service/storage-cookie.spec.js b/test/unit/service/storage-cookie.spec.js
@@ -66,7 +66,7 @@ describe('pascalprecht.translate', function () {
     });
   });
 
-  describe('$translate#storage', function () {
+  describe('$translate#storage (with ngCookies)', function () {
 
     beforeEach(module('pascalprecht.translate', 'ngCookies', function ($translateProvider) {
       $translateProvider.useStorage('$translateCookieStorage');
@@ -93,4 +93,98 @@ describe('pascalprecht.translate', function () {
       expect($translate.storage().get).toBeDefined();
     });
   });
+
+  if (angular.version.major === 1 && angular.version.minor >= 4) {
+    describe('$translate#storage (with fake $cookies)', function () {
+
+      beforeEach(module('pascalprecht.translate', function ($translateProvider, $provide) {
+        $provide.factory('$cookies', function () {
+          var data = {};
+          return {
+            get : function (key) {
+              return data[key];
+            },
+            put : function (key, value) {
+              data[key] = value;
+            }
+          };
+        });
+        $translateProvider.useStorage('$translateCookieStorage');
+      }));
+
+      var $translate, $translateCookieStorage;
+
+      beforeEach(inject(function (_$translate_, _$translateCookieStorage_) {
+        $translate = _$translate_;
+        $translateCookieStorage = _$translateCookieStorage_;
+      }));
+
+      it('should be defined', function () {
+        expect($translate.storage).toBeDefined();
+      });
+
+      it('should be a function', function () {
+        expect(typeof $translate.storage).toBe('function');
+      });
+
+      it('should return registered storage instance if exists', function () {
+        expect(typeof $translate.storage()).toBe('object');
+        expect($translate.storage().set).toBeDefined(); // deprecated
+        expect($translate.storage().put).toBeDefined();
+        expect($translate.storage().get).toBeDefined();
+      });
+
+      it('should return value again', function () {
+        $translateCookieStorage.put('ABCD', 'EFGH');
+        expect($translateCookieStorage.get('ABCD', 'EFGH')).toBe('EFGH');
+      });
+    });
+  }
+
+  if (angular.version.major === 1 && angular.version.minor < 4) {
+    describe('$translate#storage (with fake $cookieStore)', function () {
+
+      beforeEach(module('pascalprecht.translate', function ($translateProvider, $provide) {
+        $provide.factory('$cookieStore', function () {
+          var data = {};
+          return {
+            get : function (key) {
+              return data[key];
+            },
+            put : function (key, value) {
+              data[key] = value;
+            }
+          };
+        });
+        $translateProvider.useStorage('$translateCookieStorage');
+      }));
+
+      var $translate, $translateCookieStorage;
+
+      beforeEach(inject(function (_$translate_, _$translateCookieStorage_) {
+        $translate = _$translate_;
+        $translateCookieStorage = _$translateCookieStorage_;
+      }));
+
+      it('should be defined', function () {
+        expect($translate.storage).toBeDefined();
+      });
+
+      it('should be a function', function () {
+        expect(typeof $translate.storage).toBe('function');
+      });
+
+      it('should return registered storage instance if exists', function () {
+        expect(typeof $translate.storage()).toBe('object');
+        expect($translate.storage().set).toBeDefined(); // deprecated
+        expect($translate.storage().put).toBeDefined();
+        expect($translate.storage().get).toBeDefined();
+      });
+
+      it('should return value again', function () {
+        $translateCookieStorage.put('ABCD', 'EFGH');
+        expect($translateCookieStorage.get('ABCD', 'EFGH')).toBe('EFGH');
+      });
+    });
+  }
 });