From 5be2b3f867999f7ac961c670145078ac71abc0ba Mon Sep 17 00:00:00 2001 From: Simon Ho Date: Mon, 9 May 2016 12:24:18 -0700 Subject: [PATCH] Use mocha instead of Makefile for testing --- Makefile | 43 ------------------------------------------- package.json | 9 +++------ 2 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 01f9cce2..00000000 --- a/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -TESTER = ./node_modules/.bin/mocha -OPTS = --growl -TESTS = test/*.test.js - -default: help - -.PHONY: clean -clean: - rm -rf $(CURDIR)/node_modules - -.PHONY: help -help: - @echo 'Usage: make [target]' - @echo 'Targets:' - @echo ' clean Delete `node_modules`' - @echo ' help Print help (this message)' - @echo ' refresh Delete `node_modules` and run `npm install`' - @echo ' test Run tests in silent mode' - @echo ' test-verbose Run tests in verbose mode' - @echo ' testing Run tests continuously' - -.PHONY: refresh -refresh: clean - npm install - -.PHONY: test -test: - NO_DEPRECATION=loopback-datasource-juggler $(TESTER) $(OPTS) $(TESTS) - -.PHONY: test-verbose -test-verbose: - $(TESTER) $(OPTS) --reporter spec $(TESTS) - -.PHONY: testing -testing: - $(TESTER) $(OPTS) --watch $(TESTS) - -# Deprecated targets - -.PHONY: about-testing -about-testing: - @echo 'DEPRECATED: Use `make help` instead' - make help diff --git a/package.json b/package.json index fea4ef9e..9508cc7e 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,9 @@ "depd": "./lib/browser.depd.js" }, "scripts": { - "clean": "make clean", - "help": "make help", - "refresh": "make refresh", - "test": "make test", - "posttest": "npm run lint", - "lint": "eslint ." + "lint": "eslint .", + "test": "mocha", + "posttest": "npm run lint" }, "engines": [ "node >= 0.6"