From da22f06d85e5eb873bec72994f5770c4f846ba1c Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 17 Oct 2013 11:10:48 -0700 Subject: [PATCH] Revert "Make mocha use `test/mocha.opts` to DRY up options used by `npm test` and `test/runall.sh` and support coffee. Add coffee-script as devDependency to package.json" This reverts commit 9dfbffa4b8e499c5493bd8d573135cc415e8c0d6. Conflicts: test/mocha.opts --- package.json | 9 +++++++-- test/runall.sh | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7ffda30205..b6611c4e13 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,13 @@ "name": "rippled", "version": "0.0.1", "description": "Rippled Server", + "private": true, + "directories": { "test": "test" }, + "dependencies": { "ripple-lib": "0.7.25", "async": "~0.2.9", @@ -13,15 +16,17 @@ "simple-jsonrpc": "~0.0.2" }, "devDependencies": { - "coffee-script": "~1.6.3", "mocha": "~1.13.0" }, + "scripts": { - "test": "mocha test/*-test.{js,coffee}" + "test": "mocha --reporter spec --ui tdd --timeout 10000 --slow 600 test/*-test.js" }, + "repository": { "type": "git", "url": "git://github.com/ripple/rippled.git" }, + "readmeFilename": "README.md" } diff --git a/test/runall.sh b/test/runall.sh index 7964ce735e..571a28a423 100755 --- a/test/runall.sh +++ b/test/runall.sh @@ -1,4 +1,4 @@ #!/bin/bash -mocha test/*-test.{js,coffee} +mocha --ui tdd --reporter spec --timeout 10000 test/*-test.js