From ac7bfb05aedaf3ed6dfc7946db29b106afd7c191 Mon Sep 17 00:00:00 2001
From: Jure Triglav <juretriglav@gmail.com>
Date: Wed, 11 Nov 2015 10:59:04 +0100
Subject: [PATCH] Move Makefile functionality into package.json

---
 Makefile     | 6 ------
 package.json | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 69c448918..000000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TESTS = test/*.js
-
-test:
-	@NODE_ENV=test ./node_modules/.bin/mocha $(TESTS) -R nyan
-
-.PHONY: test
diff --git a/package.json b/package.json
index f2be3f2bb..45e787f54 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build": "webpack --colors --config ./webpack/webpack.prod.config.js",
     "dev": "npm run buildDev && NODE_ENV=dev LOADER=hot node bin/www",
     "buildDev": "webpack --no-info --colors --config ./webpack/webpack.dev.config.js",
-    "test": "make test",
+    "test": "NODE_ENV=test ./node_modules/.bin/mocha test/*.js -R nyan",
     "eslint": "eslint"
   },
   "dependencies": {
-- 
GitLab