From bd698257f9835d48349fb8c52485b6846a87f93d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 3 Dec 2014 08:23:53 -0300 Subject: [PATCH] add tests to insight storage + remove used code --- js/controllers/home.js | 2 + js/plugins/GoogleDrive.js | 28 --------- js/plugins/InsightStorage.js | 14 +---- js/plugins/LocalStorage.js | 34 ---------- test/plugin.insight.js | 118 +++++++++++++++++++++++++++++------ test/util.log.js | 21 ++++++- 6 files changed, 124 insertions(+), 93 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index ae8113843..df4c43ab5 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -46,6 +46,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.error = 'Invalid email or password'; } else if ((err.toString() || '').match('Connection')) { $scope.error = 'Could not connect to Insight Server'; + } else if ((err.toString() || '').match('Unable')) { + $scope.error = 'Unable to read data from the Insight Server'; } else { $scope.error = 'Unknown error'; } diff --git a/js/plugins/GoogleDrive.js b/js/plugins/GoogleDrive.js index b786fca4b..08634a279 100644 --- a/js/plugins/GoogleDrive.js +++ b/js/plugins/GoogleDrive.js @@ -298,32 +298,4 @@ GoogleDrive.prototype._checkHomeDir = function(cb) { }); }; -GoogleDrive.prototype.allKeys = function(cb) { - var self = this; - - this._checkHomeDir(function(homeId) { - preconditions.checkState(homeId); - - var request = gapi.client.request({ - 'path': '/drive/v2/files', - 'method': 'GET', - 'params': { - 'q': "'" + homeId + "' in parents and trashed = false", - 'fields': 'items(id,title)' - }, - }); - request.execute(function(res) { - // console.log('[googleDrive.js.152:res:]', res); //TODO - if (res.error) - throw new Error(res.error.message); - - var ret = []; - for (var ii in res.items) { - ret.push(res.items[ii].title); - } - return cb(ret); - }); - }); -}; - module.exports = GoogleDrive; diff --git a/js/plugins/InsightStorage.js b/js/plugins/InsightStorage.js index 522444c3e..4b78505bd 100644 --- a/js/plugins/InsightStorage.js +++ b/js/plugins/InsightStorage.js @@ -118,7 +118,7 @@ InsightStorage.prototype._makeGetRequest = function(passphrase, key, callback) { return callback('PNOTFOUND: Profile not found'); } if (response.statusCode !== 200) { - return callback('Connection error'); + return callback('Unable to read item from insight'); } return callback(null, body, InsightStorage.parseResponseHeaders(response.getAllResponseHeaders())); } @@ -217,7 +217,7 @@ InsightStorage.prototype.removeItem = function(key, callback) { 'Authorization': authHeader } }; - log.debug('erase ' + name); + log.debug('Erasing: ' + key); this.request.get(getParams, function(err, response, body) { if (err) { return callback('Connection error'); @@ -236,14 +236,4 @@ InsightStorage.prototype.clear = function(callback) { callback(); }; -InsightStorage.prototype.allKeys = function(callback) { - // TODO: compatibility with localStorage - return callback(null); -}; - -InsightStorage.prototype.getFirst = function(prefix, opts, callback) { - // TODO: compatibility with localStorage - return callback(null, true, true); -}; - module.exports = InsightStorage; diff --git a/js/plugins/LocalStorage.js b/js/plugins/LocalStorage.js index 0692a13ae..12533ef5a 100644 --- a/js/plugins/LocalStorage.js +++ b/js/plugins/LocalStorage.js @@ -46,38 +46,4 @@ LocalStorage.prototype.clear = function(cb) { return cb(); }; -LocalStorage.prototype.allKeys = function(cb) { - var l = localStorage.length; - var ret = []; - - for(var i=0; i