(#3839) - Use lie as promise polyfill everywhere

pouchdb · Jun 7, 2015 · 685297d · 685297d
1 parent ddb4d10
commit 685297d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 18 deletions.
diff --git a/lib/deps/promise.js b/lib/deps/promise.js
@@ -3,5 +3,5 @@
 if (typeof Promise === 'function') {
  module.exports = Promise;
 } else {
- module.exports = require('bluebird');
-}
+ module.exports = require('lie');
+}
diff --git a/package.json b/package.json
@@ -17,7 +17,6 @@
  ],
  "dependencies": {
  "argsarray": "0.0.1",
- "bluebird": "^1.2.4",
  "debug": "^2.1.2",
  "double-ended-queue": "^2.0.0-0",
  "es3ify": "^0.1.3",
@@ -113,7 +112,6 @@
  "./lib/adapters/preferredAdapters.js": "./lib/adapters/preferredAdapters-browser.js",
  "./lib/deps/buffer.js": "./lib/deps/buffer-browser.js",
  "./lib/deps/migrate.js": "./lib/deps/migrate-browser.js",
- "bluebird": "lie",
  "fs": false,
  "leveldown": false
  }

diff --git a/tests/component/test.headers.js b/tests/component/test.headers.js
@@ -3,9 +3,6 @@
 var http = require('http');
 var PouchDB = require('../../lib');
 var should = require("chai").should();
-require('bluebird').onPossiblyUnhandledRejection(function (e, promise) {
- throw e;
-});
 
 describe('test.headers.js', function () {
 

diff --git a/tests/integration/utils.js b/tests/integration/utils.js
@@ -249,9 +249,6 @@ if (typeof module !== 'undefined' && module.exports) {
  testDir = testDir.slice(-1) === '/' ? testDir : testDir + '/';
  global.PouchDB.prefix = testDir + global.PouchDB.prefix;
  require('../../lib/adapters/leveldb').use_prefix = true;
- require('bluebird').onPossiblyUnhandledRejection(function (e, promise) {
- throw e;
- });
  }
  module.exports = testUtils;
 }
diff --git a/tests/performance/perf.attachments.js b/tests/performance/perf.attachments.js
@@ -30,9 +30,7 @@ function randomBlob(size) {
 
 module.exports = function (PouchDB, opts) {
 
- // need to use bluebird for promises everywhere, so we're comparing
- // apples to apples
- require('bluebird'); // var Promise = require('bluebird');
+ require('lie');
  var utils = require('./utils');
 
  var testCases = [

diff --git a/tests/performance/perf.basics.js b/tests/performance/perf.basics.js
@@ -2,7 +2,7 @@
 
 module.exports = function (PouchDB, opts) {
 
- var Promise = require('bluebird');
+ var Promise = require('lie');
  var utils = require('./utils');
  var commonUtils = require('../common-utils.js');
 

diff --git a/tests/performance/perf.views.js b/tests/performance/perf.views.js
@@ -2,9 +2,7 @@
 
 module.exports = function (PouchDB, opts) {
 
- // need to use bluebird for promises everywhere, so we're comparing
- // apples to apples
- var Promise = require('bluebird');
+ var Promise = require('lie');
  var utils = require('./utils');
 
  function makeTestDocs() {

diff --git a/tests/performance/utils.js b/tests/performance/utils.js
@@ -3,7 +3,7 @@
 var reporter = require('./perf.reporter');
 var test = require('tape');
 var commonUtils = require('../common-utils.js');
-var Promise = require('bluebird');
+var Promise = require('lie');
 
 var grep;
 if (global.window && global.window.location && global.window.location.search) {