chore: upgrade tests

Author: tyler-johnson

.gitignore

@@ -1,10 +1,9 @@
-node_modules
+node_modules/
 /index.js
 /cli.js
 /es6.js
 /couch-store.js
 /memory-store.js
-config.json
 /test.js
+config.json
 log.txt
-tmp_test_data

.npmignore

@@ -2,4 +2,4 @@
 Makefile
 rollup.config.js
 log.txt
-tmp_test_data
+config.json

Makefile

@@ -20,20 +20,13 @@ couch-store.js: src/couch-store.js $(SRC)
 memory-store.js: src/memory-store.js $(SRC)
 	$(BIN)/rollup $< -c -f cjs > $@
 
-test.js: test/run.js index.js couch-store.js memory-store.js $(TEST)
+test.js: test/index.js index.js couch-store.js memory-store.js $(TEST)
 	$(BIN)/rollup $< -c -f cjs > $@
 
-test: test.js install-self
+test: test.js
 	node $<
-	make clean-self
 
-install-self: clean-self
-	ln -s ../ node_modules/couchdb-jwt
-
-clean-self:
-	rm -f node_modules/couchdb-jwt
-
-clean: clean-self
+clean:
 	rm -f index.js es6.js cli.js couch-store.js memory-store.js test.js
 
-.PHONY: build clean test install-self clean-self
+.PHONY: build clean test

bin/test.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+BIN=node_modules/.bin
+export COUCHDB_URL=http://localhost:16392
+export COUCHDB_SECRET=secret
+export COUCHDB_USER=testuser
+export COUCHDB_PASS=test
+
+# setup the data directory
+echo "{ \"jwt_auth\": { \"hs_secret\": \"$(echo -n $COUCHDB_SECRET | openssl base64)\" } }" > config.json
+
+# start db server in background using cli file
+$BIN/express-jwt-pouchdb -m -p 16392 &
+SERVER_PID=$!
+sleep 5
+
+# add a user
+curl -X PUT "$COUCHDB_URL/_users/org.couchdb.user:$COUCHDB_USER" \
+	-H "Content-Type: application/json" \
+	-d "{\"password\":\"$COUCHDB_PASS\",\"type\":\"user\",\"name\":\"$COUCHDB_USER\",\"roles\":[]}"
+
+# run tests
+make test
+TEST_CODE=$?
+
+# clean up and exit
+kill $SERVER_PID
+rm -rf ./tmp_test_data
+exit $TEST_CODE

package.json

@@ -18,7 +18,7 @@
   "scripts": {
     "lint": "eslint src/ test/",
     "build": "make clean && make",
-    "test": "make test",
+    "test": "bin/test.sh",
     "prepublish": "npm run build",
     "autorelease": "autorelease pre && npm publish && autorelease post"
   },
@@ -36,29 +36,29 @@
     "autorelease-github": "^1.1.1",
     "autorelease-travis": "^1.2.0",
     "babel": "^6.5.2",
-    "babel-cli": "^6.5.1",
     "babel-eslint": "~5.0.0",
     "babel-plugin-external-helpers": "^6.5.0",
     "babel-plugin-transform-async-to-generator": "^6.5.0",
     "babel-plugin-transform-es2015-destructuring": "^6.5.0",
     "babel-plugin-transform-es2015-parameters": "^6.5.0",
     "babel-plugin-transform-export-extensions": "^6.5.0",
     "babel-plugin-transform-object-rest-spread": "^6.5.0",
-    "del": "^2.2.0",
     "eslint": "~2.2.0",
-    "express-pouchdb": "^1.0.3",
-    "fs-promise": "^0.5.0",
+    "express-jwt-pouchdb": "^1.1.0",
     "rollup": "~0.25.3",
     "rollup-plugin-babel": "~2.3.9",
-    "superagent-prefix": "0.0.2",
-    "superagent-promise-plugin": "^2.1.0",
+    "supertest": "^1.2.0",
     "tape": "~4.4.0"
   },
   "keywords": [
     "couchdb",
     "jsonwebtoken",
     "jwt",
-    "authentication"
+    "authentication",
+    "pouchdb",
+    "auth",
+    "token",
+    "session"
   ],
   "license": "MIT"
 }