Skip to content

getItem should return null for not-existing keys #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Download merged 2 commits into from
Aug 30, 2016
Merged

getItem should return null for not-existing keys #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1745d4a
Merge pull request #1 from Download/master
Dec 4, 2015
c2f2ff1
Making getItem Storage API conforming by returning null instead of un…
semmel Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/memorystorage.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/memorystorage.min.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/memorystorage.umd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function MemoryStorage(id) {// jshint ignore:line
});
// Create API methods
result.getItem = function MemoryStorage_getItem(key) {
return key in API ? this[CLOAK][key] : this[key];
return (key in API ? this[CLOAK][key] : this[key]) || null;
};
result.setItem = function MemoryStorage_setItem(key, val) {
if (key in API) {this[CLOAK][key] = val;}
Expand Down
2 changes: 1 addition & 1 deletion src/memorystorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function MemoryStorage(id) {// jshint ignore:line
});
// Create API methods
result.getItem = function MemoryStorage_getItem(key) {
return key in API ? this[CLOAK][key] : this[key];
return (key in API ? this[CLOAK][key] : this[key]) || null;
};
result.setItem = function MemoryStorage_setItem(key, val) {
if (key in API) {this[CLOAK][key] = val;}
Expand Down
10 changes: 5 additions & 5 deletions tests/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ QUnit.test("W3C Web Storage API Compliance Test", function( assert ) {
assert.ok(store.length===2, "item removed correctly with removeItem");
store.removeItem('test1');
assert.ok(store.length===2, "double removal has no effect");
assert.ok(store.getItem('test1')===undefined, "get removed item returns undefined");
assert.ok(store.getItem('test1')===null, "get removed item returns null");

store.clear();
store.setItem('getItem', 'test');
Expand All @@ -53,21 +53,21 @@ QUnit.test("W3C Web Storage API Compliance Test", function( assert ) {
"store API key names are included in the key enumeration");
}
store.removeItem('getItem');
assert.ok(store.getItem('getItem') === undefined, "After removal of item with API name, getItem returns undefined.");
assert.ok(store.getItem('getItem') === null, "After removal of item with API name, getItem returns null.");

var glob = new MemoryStorage();
assert.ok(glob.length===0, "local store items are not visible globally");
glob.setItem('glob0', 'data0');
assert.ok(glob.length===1 && glob.getItem('glob0')==='data0', "globally stored items are retrieved ok");
assert.ok(store.getItem('glob0')===undefined, "global items are not visible in the local store");
assert.ok(store.getItem('glob0')===null, "global items are not visible in the local store");
glob.removeItem('glob0');
assert.ok(glob.length===0, "global length is updated correctly");
assert.ok(glob.key(0)===null, "global keys are removed correctly");
assert.ok(glob.getItem('glob0')===undefined, "global values are removed correctly");
assert.ok(glob.getItem('glob0')===null, "global values are removed correctly");

assert.ok(store.length===0, "store is cleared");
assert.ok(store.key(0)===null, "no keys in cleared store");
assert.ok(store.getItem('test0')===undefined, "no values in cleared store");
assert.ok(store.getItem('test0')===null, "no values in cleared store");
});

QUnit.test("Multiple Instances Test", function( assert ) {
Expand Down