From 25f50b8cdf5cad1d944dc56896220669ba2f14d8 Mon Sep 17 00:00:00 2001 From: Dick Choi Date: Sat, 27 Aug 2016 23:46:08 +0900 Subject: [PATCH] fix type stoargeKey -> storageKey --- tests/dataApi/addStorage.js | 2 +- tests/dataApi/createFolder.js | 4 ++-- tests/dataApi/createNote.js | 9 +++++---- tests/dataApi/deleteFolder.js | 6 +++--- tests/dataApi/init.js | 2 +- tests/dataApi/removeStorage.js | 4 ++-- tests/dataApi/renameStorage.js | 6 +++--- tests/dataApi/updateFolder.js | 6 +++--- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/tests/dataApi/addStorage.js b/tests/dataApi/addStorage.js index e834551b..001595b9 100644 --- a/tests/dataApi/addStorage.js +++ b/tests/dataApi/addStorage.js @@ -24,7 +24,7 @@ test.beforeEach((t) => { localStorage.setItem('storages', JSON.stringify([])) }) -test.serial('add a initialized storage', (t) => { +test.serial('Add Storage', (t) => { const input = { type: 'FILESYSTEM', name: 'add-storage1', diff --git a/tests/dataApi/createFolder.js b/tests/dataApi/createFolder.js index 1761eef7..986123b0 100644 --- a/tests/dataApi/createFolder.js +++ b/tests/dataApi/createFolder.js @@ -22,14 +22,14 @@ test.beforeEach((t) => { }) test.serial('Create a folder', (t) => { - const stoargeKey = t.context.storage.cache.key + const storageKey = t.context.storage.cache.key const input = { name: 'created', color: '#ff5555' } return Promise.resolve() .then(function doTest () { - return createFolder(stoargeKey, input) + return createFolder(storageKey, input) }) .then(function assert (data) { t.true(_.find(data.storage.folders, input) != null) diff --git a/tests/dataApi/createNote.js b/tests/dataApi/createNote.js index 74eb2940..7a983fef 100644 --- a/tests/dataApi/createNote.js +++ b/tests/dataApi/createNote.js @@ -8,7 +8,6 @@ global.navigator = window.navigator const Storage = require('dom-storage') const localStorage = window.localStorage = global.localStorage = new Storage(null, { strict: true }) const path = require('path') -const _ = require('lodash') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') @@ -23,7 +22,7 @@ test.beforeEach((t) => { }) test.serial('Create a note', (t) => { - const stoargeKey = t.context.storage.cache.key + const storageKey = t.context.storage.cache.key const folderKey = t.context.storage.json.folders[0].key const input1 = { @@ -50,14 +49,15 @@ test.serial('Create a note', (t) => { return Promise.resolve() .then(function doTest () { return Promise.all([ - createNote(stoargeKey, input1), - createNote(stoargeKey, input2) + createNote(storageKey, input1), + createNote(storageKey, input2) ]) }) .then(function assert (data) { let data1 = data[0] let data2 = data[1] + t.is(storageKey, data1.storage) let jsonData1 = CSON.readFileSync(path.join(storagePath, 'notes', data1.key + '.cson')) t.is(input1.title, data1.title) t.is(input1.title, jsonData1.title) @@ -72,6 +72,7 @@ test.serial('Create a note', (t) => { t.is(input1.snippets[0].name, data1.snippets[0].name) t.is(input1.snippets[0].name, jsonData1.snippets[0].name) + t.is(storageKey, data2.storage) let jsonData2 = CSON.readFileSync(path.join(storagePath, 'notes', data2.key + '.cson')) t.is(input2.title, data2.title) t.is(input2.title, jsonData2.title) diff --git a/tests/dataApi/deleteFolder.js b/tests/dataApi/deleteFolder.js index 459ff8bb..f760c819 100644 --- a/tests/dataApi/deleteFolder.js +++ b/tests/dataApi/deleteFolder.js @@ -21,13 +21,13 @@ test.beforeEach((t) => { localStorage.setItem('storages', JSON.stringify([t.context.storage.cache])) }) -test.serial('Create a folder', (t) => { - const stoargeKey = t.context.storage.cache.key +test.serial('Delete a folder', (t) => { + const storageKey = t.context.storage.cache.key const folderKey = t.context.storage.json.folders[0].key return Promise.resolve() .then(function doTest () { - return deleteFolder(stoargeKey, folderKey) + return deleteFolder(storageKey, folderKey) }) .then(function assert (data) { t.true(_.find(data.storage.folders, {key: folderKey}) == null) diff --git a/tests/dataApi/init.js b/tests/dataApi/init.js index 0f4a1ed4..81ef38a4 100644 --- a/tests/dataApi/init.js +++ b/tests/dataApi/init.js @@ -35,7 +35,7 @@ test.beforeEach((t) => { localStorage.setItem('storages', JSON.stringify([t.context.v1StorageData.cache, t.context.legacyStorageData.cache, t.context.emptyStorageData.cache])) }) -test.serial('Fetch storages and notes', (t) => { +test.serial('Initialize All Storages', (t) => { const { v1StorageData, legacyStorageData, emptyStorageData } = t.context return Promise.resolve() .then(function test () { diff --git a/tests/dataApi/removeStorage.js b/tests/dataApi/removeStorage.js index 041983b7..33541df1 100644 --- a/tests/dataApi/removeStorage.js +++ b/tests/dataApi/removeStorage.js @@ -20,10 +20,10 @@ test.beforeEach((t) => { }) test('Remove a storage', (t) => { - const stoargeKey = t.context.storage.cache.key + const storageKey = t.context.storage.cache.key return Promise.resolve() .then(function doTest () { - return removeStorage(stoargeKey) + return removeStorage(storageKey) }) .then(function assert (data) { t.is(JSON.parse(localStorage.getItem('storages')).length, 0) diff --git a/tests/dataApi/renameStorage.js b/tests/dataApi/renameStorage.js index de4b9e79..b898d6f1 100644 --- a/tests/dataApi/renameStorage.js +++ b/tests/dataApi/renameStorage.js @@ -21,14 +21,14 @@ test.beforeEach((t) => { }) test.serial('Rename a storage', (t) => { - const stoargeKey = t.context.storage.cache.key + const storageKey = t.context.storage.cache.key return Promise.resolve() .then(function doTest () { - return renameStorage(stoargeKey, 'changed') + return renameStorage(storageKey, 'changed') }) .then(function assert (data) { let cachedStorageList = JSON.parse(localStorage.getItem('storages')) - t.true(_.find(cachedStorageList, {key: stoargeKey}).name === 'changed') + t.true(_.find(cachedStorageList, {key: storageKey}).name === 'changed') }) }) diff --git a/tests/dataApi/updateFolder.js b/tests/dataApi/updateFolder.js index c8aacb60..9ebbdc9f 100644 --- a/tests/dataApi/updateFolder.js +++ b/tests/dataApi/updateFolder.js @@ -21,8 +21,8 @@ test.beforeEach((t) => { localStorage.setItem('storages', JSON.stringify([t.context.storage.cache])) }) -test.serial('Create a folder', (t) => { - const stoargeKey = t.context.storage.cache.key +test.serial('Update a folder', (t) => { + const storageKey = t.context.storage.cache.key const folderKey = t.context.storage.json.folders[0].key const input = { name: 'changed', @@ -30,7 +30,7 @@ test.serial('Create a folder', (t) => { } return Promise.resolve() .then(function doTest () { - return updateFolder(stoargeKey, folderKey, input) + return updateFolder(storageKey, folderKey, input) }) .then(function assert (data) { t.true(_.find(data.storage.folders, input) != null)