Browse files

Merge branch 'master' of github.com:raqqa/node-tmdb

  • Loading branch information...
2 parents 4f2e121 + 55ebfe3 commit aa70a9bb3d0c60537e45d36ab2eb1068ea3703b0 @raqqa committed Aug 8, 2012
Showing with 15 additions and 4 deletions.
  1. +11 −0 Makefile
  2. +3 −3 package.json
  3. +1 −1 test/test.js
View
11 Makefile
@@ -0,0 +1,11 @@
+ALL_TESTS = $(shell find test/ -name '*test.js')
+
+run-tests:
+ @./node_modules/.bin/mocha \
+ $(TESTFLAGS) \
+ $(TESTS)
+
+test:
+ @$(MAKE) NODE_PATH=lib TESTS="$(ALL_TESTS)" run-tests
+
+.PHONY: test
View
6 package.json
@@ -4,10 +4,10 @@
"description": "Implementation of TMDb's v3 API",
"author": "Mikael Emilsson <mikael.emilsson@gmail.com>",
"dependencies": {
- "request": "2.9.x",
+ "request": "2.9.x"
},
"devDependencies": {
"should": "*",
- "mocha": "1.x.x",
- },
+ "mocha": "1.x.x"
+ }
}
View
2 test/test.js
@@ -1,6 +1,6 @@
var fs = require('fs');
var should = require('should');
-var key = new String(fs.readFileSync('APIKEY')).replace(/(\r\n|\n|\r)/gm,"");
+var key = new String(fs.readFileSync(__dirname + '/APIKEY')).replace(/(\r\n|\n|\r)/gm,"");
var tmdb = require('../lib/tmdb').init(key);
describe("General methods", function() {

0 comments on commit aa70a9b

Please sign in to comment.