Merge pull request #74 from Level/airtap

Add Airtap

Author: vweevers

.airtap.yml

@@ -0,0 +1,7 @@
+browsers:
+  - name: chrome
+    version: latest
+    platform: Windows 10
+  - name: firefox
+    version: latest
+    platform: Windows 10

.travis.yml

@@ -0,0 +1,8 @@
+language: node_js
+node_js: stable
+script:
+  - npm run test-browsers
+addons:
+  hosts:
+    - airtap.local
+  sauce_connect: true

README.md

@@ -2,7 +2,7 @@
 
 level.js an implementation of the [leveldown](https://github.com/rvagg/node-leveldown) API on top of [IndexedDB](https://developer.mozilla.org/en-US/docs/IndexedDB) (which is in turn implemented on top of [LevelDB](https://code.google.com/p/leveldb/), which brings this whole shebang full circle)
 
-**Most people use [levelup](http://github.com/rvagg/node-levelup) on top of this library. See `test-levelup.js` for details** 
+**Most people use [levelup](http://github.com/rvagg/node-levelup) on top of this library. See `test-levelup.js` for details**
 
 For some demos of it working, see @brycebaril's presentation "Path of the NodeBases Jedi": http://brycebaril.github.io/nodebase_jedi/#/vanilla
 
@@ -28,6 +28,10 @@ npm install level-js
 
 This library is best used with [browserify](http://browserify.org)
 
+## Browser support
+
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/level-js.svg)](https://saucelabs.com/u/level-js)
+
 ## code examples
 
 ```js
@@ -54,6 +58,12 @@ open localhost:9966
 
 Then look in your browser console
 
+## Big Thanks
+
+Cross-browser Testing Platform and Open Source ♥ Provided by [Sauce Labs](https://saucelabs.com).
+
+[![Sauce Labs logo](./sauce-labs.svg)](https://saucelabs.com)
+
 ## license
 
 BSD

package.json

@@ -4,11 +4,12 @@
   "description": "leveldown/leveldb library for browsers using IndexedDB",
   "main": "index.js",
   "scripts": {
-    "test": "beefy test/test.js:test.js test/test-levelup.js:test-levelup.js"
+    "test": "airtap --local --no-coverage test/index.js",
+    "test-browsers": "airtap --sauce-connect --loopback airtap.local --no-coverage test/index.js"
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:maxogden/level.js.git"
+    "url": "git@github.com:Level/level.js.git"
   },
   "keywords": [
     "level",
@@ -17,7 +18,7 @@
   "author": "max ogden",
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "beefy": "~2.1.8",
+    "airtap": "0.0.5",
     "browserify": "~16.2.2",
     "levelup": "~0.18.2",
     "tape": "^4.0.0"
@@ -29,15 +30,5 @@
     "ltgt": "^2.1.2",
     "typedarray-to-buffer": "~3.1.5",
     "xtend": "~4.0.1"
-  },
-  "testling": {
-    "files": "test/test.js",
-    "browsers": [
-      "ie/10..latest",
-      "firefox/17..latest",
-      "chrome/25..latest",
-      "opera/15..latest",
-      "safari/6.0..latest"
-    ]
   }
 }

sauce-labs.svg

@@ -1,16 +1,7 @@
 var levelup = require('levelup')
 
-module.exports.setUp = function (leveldown, test, testCommon) {
-  test('setUp common', testCommon.setUp)
-  test('setUp db', function (t) {
-    db = leveldown(testCommon.location())
-    db.open(t.end.bind(t))
-  })
-}
-
 module.exports.all = function(leveljs, tape, testCommon) {
-
-  module.exports.setUp(leveljs, tape, testCommon)
+  tape('setUp', testCommon.setUp)
 
   // This is covered by abstract-leveldown tests, but we're
   // not on latest yet, so this is insurance.
@@ -24,7 +15,7 @@ module.exports.all = function(leveljs, tape, testCommon) {
           t.notOk(err, 'no error')
           t.ok(Buffer.isBuffer(value), 'is buffer')
           t.same(value, Buffer.from('00ff', 'hex'))
-          t.end()
+          level.close(t.end.bind(t))
         })
       })
     })
@@ -40,7 +31,7 @@ module.exports.all = function(leveljs, tape, testCommon) {
           t.notOk(err, 'no error')
           t.ok(typeof value === 'boolean', 'is boolean type')
           t.ok(value, 'is truthy')
-          t.end()
+          level.close(t.end.bind(t))
         })
       })
     })
@@ -50,20 +41,21 @@ module.exports.all = function(leveljs, tape, testCommon) {
   // then create it again, then try and destroy it again. these avoid doing that
 
   tape('test levelup .destroy w/ string', function(t) {
-    var level = levelup('destroy-test', {db: leveljs})
+    var location = testCommon.location()
+    var level = levelup(location, {db: leveljs})
     level.put('key', 'value', function (err) {
       t.notOk(err, 'no error')
       level.get('key', function (err, value) {
         t.notOk(err, 'no error')
         t.equal(value, 'value', 'should have value')
         level.close(function (err) {
           t.notOk(err, 'no error')
-          leveljs.destroy('destroy-test', function (err) {
+          leveljs.destroy(location, function (err) {
             t.notOk(err, 'no error')
-            var level2 = levelup('destroy-test', {db: leveljs})
+            var level2 = levelup(location, {db: leveljs})
             level2.get('key', function (err, value) {
               t.ok(err, 'key is not there')
-              t.end()
+              level2.close(t.end.bind(t))
             })
           })
         })
@@ -72,7 +64,8 @@ module.exports.all = function(leveljs, tape, testCommon) {
   })
 
   tape('test levelup .destroy w/ db instance', function(t) {
-    var level = levelup('destroy-test-2', {db: leveljs})
+    var location = testCommon.location()
+    var level = levelup(location, {db: leveljs})
     level.put('key', 'value', function (err) {
       t.notOk(err, 'no error')
       level.get('key', function (err, value) {
@@ -82,15 +75,16 @@ module.exports.all = function(leveljs, tape, testCommon) {
           t.notOk(err, 'no error')
           leveljs.destroy(level.db, function (err) {
             t.notOk(err, 'no error')
-            var level2 = levelup('destroy-test-2', {db: leveljs})
+            var level2 = levelup(location, {db: leveljs})
             level2.get('key', function (err, value) {
               t.ok(err, 'key is not there')
-              t.end()
+              level2.close(t.end.bind(t))
             })
           })
         })
       })
     })
   })
 
+  tape('teardown', testCommon.tearDown)
 }

test/custom-tests.js

@@ -0,0 +1,2 @@
+require('./test')
+require('./test-levelup')

test/index.js

@@ -1,59 +1,64 @@
-/*** Levelup tests 
-  (the actual test suite isnt runnable in browser, and these arent complete)
+/*** Levelup tests
+  Temporary to test integration, can be removed later.
 ***/
 var levelup = require('levelup')
 var leveljs = require('../')
+var test = require('tape')
+var testCommon = require('./testCommon')
 
-window.db = levelup('foo', { db: leveljs })
+function identity (v) {
+  return v
+}
 
-db.put('name', 'LevelUP string', function (err) {
-  if (err) return console.log('Ooops!', err) // some kind of I/O error
-  db.get('name', function (err, value) {
-    if (err) return console.log('Ooops!', err) // likely the key was not found
-    console.log('name=' + value)
-  })
-})
+test('setup', testCommon.setUp)
+
+test('levelup put', function (t) {
+  t.plan(4)
+
+  // TODO: update signature after upgrading levelup
+  var db = levelup(testCommon.location(), { db: leveljs })
+
+  db.put('name', 'LevelUP string', function (err) {
+    t.ifError(err, 'no put error')
+
+    db.get('name', function (err, value) {
+      t.ifError(err, 'no get error')
+      t.is(value, 'LevelUP string')
 
-var ary = new Uint8Array(1)
-ary[0] = 1
-db.put('binary', ary, function (err) {
-  if (err) return console.log('Ooops!', err) // some kind of I/O error
-  db.get('binary', function (err, value) {
-    if (err) return console.log('Ooops!', err) // likely the key was not found
-    console.log('binary', value)
+      db.close(function (err) {
+        t.ifError(err, 'no close error')
+      })
+    })
   })
 })
 
-var writeStream = db.createWriteStream()
-writeStream.on('error', function (err) {
-  console.log('Oh my!', err)
-})
-writeStream.on('close', function () {
-  console.log('Stream closed')
-  db.createKeyStream()
-    .on('data', function (data) {
-      console.log('KEYSTREAM', data)
-    })
-    .on('error', function (err) {
-      console.log('Oh my!', err)
-    })
-  db.createReadStream()
-    .on('data', function (data) {
-      console.log('READSTREAM', data.key, '=', data.value)
-    })
-    .on('error', function (err) {
-      console.log('Oh my!', err)
-    })
-  db.createValueStream()
-    .on('data', function (data) {
-      console.log('VALUESTREAM', data)
-    })
-    .on('error', function (err) {
-      console.log('Oh my!', err)
+test('binary', function (t) {
+  t.plan(6)
+
+  // TODO: update signature after upgrading levelup
+  var db = levelup(testCommon.location(), { db: leveljs, valueEncoding: 'binary' })
+  var buf = Buffer.from('00ff', 'hex')
+
+  db.put('binary', buf, function (err) {
+    t.ifError(err, 'no put error')
+
+    db.get('binary', function (err, value) {
+      t.ifError(err, 'no get error')
+
+      // This levelup is really old and its binary decoder does:
+      // `return process.browser ? buffer.toString(type) : buffer`
+      t.notOk(Buffer.isBuffer(value), 'not a buffer')
+
+      db.get('binary', { valueEncoding: { decode: identity } }, function (err, value) {
+        t.ifError(err, 'no get error')
+        t.ok(Buffer.isBuffer(value), 'is a buffer')
+
+        db.close(function (err) {
+          t.ifError(err, 'no close error')
+        })
+      })
     })
+  })
 })
-writeStream.write({ key: 'name', value: 'Yuri Irsenovich Kim' })
-writeStream.write({ key: 'dob', value: '16 February 1941' })
-writeStream.write({ key: 'spouse', value: 'Kim Young-sook' })
-writeStream.write({ key: 'occupation', value: 'Clown' })
-writeStream.end()
+
+test('teardown', testCommon.tearDown)