Skip to content

Commit

Permalink
Changing HTTP test frameworks & updating tests, updating sample
Browse files Browse the repository at this point in the history
  • Loading branch information
avoidwork committed Feb 20, 2017
1 parent d53b692 commit bf99406
Show file tree
Hide file tree
Showing 7 changed files with 306 additions and 625 deletions.
4 changes: 4 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"classes": false,
"modules": [2]
},
"globals": {
"describe": true,
"it": true
},
"rules": {
"arrow-parens": [2, "as-needed"],
"arrow-spacing": [2, {"before": true, "after": true}],
Expand Down
5 changes: 4 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ module.exports = function (grunt) {
grunt.initConfig({
pkg : grunt.file.readJSON("package.json"),
eslint: {
target: ["lib/*.js"]
target: [
"lib/*.js",
"test/*.js"
]
},
mochaTest : {
options: {
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tenso",
"description": "Tensō is an elastic REST API gateway for node.js",
"version": "4.3.29",
"version": "4.3.30",
"homepage": "http://avoidwork.github.io/tenso",
"author": "Jason Mulligan <[email protected]>",
"repository": {
Expand Down Expand Up @@ -45,20 +45,20 @@
"tiny-merge": "~1.0.0",
"tiny-uuid4": "~1.0.1",
"tiny-xml": "~1.0.6",
"turtle.io": "~7.4.15",
"turtle.io": "~7.4.17",
"uws": "~0.12.0",
"yamljs": "~0.2.8"
},
"devDependencies": {
"grunt": "~0.4.5",
"grunt-cli": "~0.1.13",
"grunt-contrib-watch": "~0.2.0",
"grunt": "~1.0.1",
"grunt-cli": "~1.2.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-eslint": "~19.0.0",
"grunt-mocha-test": "~0.12.7",
"grunt-mocha-test": "~0.13.2",
"grunt-nsp": "~2.3.1",
"hippie": "~0.4.0",
"jsonwebtoken": "^7.2.1",
"mocha": "~2.4.5"
"mocha": "~3.2.0",
"jsonwebtoken": "~7.3.0",
"tiny-httptest": "~1.0.5"
},
"keywords": [
"REST",
Expand Down
4 changes: 1 addition & 3 deletions sample.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ require("./index.js")({
port: 8000,
routes: require("./test/routes.js"),
logging: {
level: "error",
dtrace: true,
stderr: true
level: "info"
},
auth: {
local: {
Expand Down
Loading

0 comments on commit bf99406

Please sign in to comment.