Updated for tests and linting

revert-117-master
Gregory Pike 10 years ago
parent d236005a44
commit d699266785

@ -16,7 +16,7 @@ module.exports = function(grunt) {
],
configFile: 'test/karma.conf.js',
reporters: ['dots'],
singleRun: false
singleRun: true
},
unit: {}
},
@ -29,9 +29,7 @@ module.exports = function(grunt) {
},
dev: {
src: ['angular-local-storage.js'],
options: {
jshintrc: '.jshintrc',
}
options: {}
},
test: {
src: ['test/spec/**/*.js'],

@ -215,10 +215,10 @@ angularLocalStorage.provider('localStorageService', function() {
// Should be used mostly for development purposes
var clearAllFromLocalStorage = function (regularExpression) {
var regularExpression = regularExpression || "";
regularExpression = regularExpression || "";
//accounting for the '.' in the prefix when creating a regex
var tempPrefix = prefix.slice(0, -1) + "\.";
var testRegex = RegExp(tempPrefix + regularExpression);
var tempPrefix = prefix.slice(0, -1);
var testRegex = new RegExp(tempPrefix + '.' + regularExpression);
if (!browserSupportsLocalStorage) {
$rootScope.$broadcast('LocalStorageModule.notification.warning', 'LOCAL_STORAGE_NOT_SUPPORTED');
@ -357,7 +357,7 @@ angularLocalStorage.provider('localStorageService', function() {
clearAll: clearAllFromCookies
}
};
}]
}];
});
}).call(this);

@ -40,10 +40,10 @@ module.exports = function(config) {
logLevel: config.LOG_INFO,
// web server port
port: 8080,
port: 8999,
// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false
singleRun: true,
});
};

@ -1,12 +1,16 @@
'use strict';
describe('Tests functionality of the localStorage module', function() {
var ls, p, store = [];
beforeEach(module('LocalStorageModule', function(localStorageServiceProvider) {
p = localStorageServiceProvider;
}));
var ls, store = [];
beforeEach(inject(function(_localStorageService_) {
ls = _localStorageService_;
spyOn(ls, 'get').andCallFake(function(key) {
if(store[key].charAt(0) === "{" || store[key].charAt(0) === "["){
if (store[key].charAt(0) === '{' || store[key].charAt(0) === '[') {
return angular.fromJson(store[key]);
} else {
return store[key];
@ -20,7 +24,8 @@ describe('Tests functionality of the localStorage module', function(){
if (angular.isNumber(val)){
val = val.toString();
}
return store[key] = val;
store[key] = val;
return store[key];
});
spyOn(ls, 'clearAll').andCallFake(function() {
@ -29,7 +34,7 @@ describe('Tests functionality of the localStorage module', function(){
});
}));
it("Should add a value to my local storage", function(){
it('Should add a value to my local storage', function() {
var n = 234;
ls.set('test', n);
//Since localStorage makes the value a string, we look for the '234' and not 234
@ -39,12 +44,11 @@ describe('Tests functionality of the localStorage module', function(){
ls.set('object', obj);
var res = ls.get('object');
expect(res.key).toBe('val');
});
it('Should allow me to set a prefix', function() {
p.setPrefix("myPref");
expect(p.prefix).toBe("myPref");
p.setPrefix('myPref');
expect(p.prefix).toBe('myPref');
});
it('Should allow me to set the cookie values', function() {