From b21352f668bafc803384d46215894279e00d8448 Mon Sep 17 00:00:00 2001 From: dryajov Date: Sun, 5 Feb 2017 17:00:36 -0800 Subject: [PATCH 1/2] change window to self for webworker support --- test/browser.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/browser.js b/test/browser.js index f5b811c0..c23f79bc 100644 --- a/test/browser.js +++ b/test/browser.js @@ -8,10 +8,10 @@ const pull = require('pull-stream') const repoContext = require.context('buffer!./test-repo', true) -const idb = window.indexedDB || - window.mozIndexedDB || - window.webkitIndexedDB || - window.msIndexedDB +const idb = self.indexedDB || + self.mozIndexedDB || + self.webkitIndexedDB || + self.msIndexedDB // book keeping let dbs = [] From 8ff8f0be0fc8a32780d4c2c69aba54029f415438 Mon Sep 17 00:00:00 2001 From: dmitriy ryajov Date: Tue, 7 Feb 2017 21:30:04 -0800 Subject: [PATCH 2/2] fix test-data paths in webworker --- package.json | 4 ++-- test/types/message.spec.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ab76b04a..2e9e9e9f 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ }, "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme", "devDependencies": { - "aegir": "9.4.0", + "aegir": "^10.0.0", "benchmark": "^2.1.3", "buffer-loader": "0.0.1", "chai": "^3.5.0", @@ -85,4 +85,4 @@ "greenkeeperio-bot ", "npmcdn-to-unpkg-bot " ] -} \ No newline at end of file +} diff --git a/test/types/message.spec.js b/test/types/message.spec.js index f80076f1..c3650e02 100644 --- a/test/types/message.spec.js +++ b/test/types/message.spec.js @@ -8,9 +8,10 @@ const protobuf = require('protocol-buffers') const map = require('async/map') const pbm = protobuf(require('../../src/types/message/message.proto')) const CID = require('cids') +const isNode = require('detect-node') const loadFixture = require('aegir/fixtures') -const testDataPath = '../test-data/serialized-from-go' +const testDataPath = (isNode ? '../' : '') + 'test-data/serialized-from-go' const rawMessageFullWantlist = loadFixture(__dirname, testDataPath + '/bitswap110-message-full-wantlist') const rawMessageOneBlock = loadFixture(__dirname, testDataPath + '/bitswap110-message-one-block')