Permalink
Browse files

Merge branch 'development' into 503-spec-implementation

Conflicts:
	Makefile
  • Loading branch information...
2 parents c9ff11d + ba0de2e commit 44785f332c82772ca75dec413eb3561adea5d2b0 @brianloveswords brianloveswords committed Mar 8, 2013
Showing with 7 additions and 6 deletions.
  1. +3 −3 Makefile
  2. +2 −2 README.md
  3. +2 −1 package.json
View
@@ -33,7 +33,7 @@ jenkins_build:
migrate:
./bin/db-migrate up
-start: migrate
- ./node_modules/.bin/up -w -n 1 -p 8888 app.js
+start:
+ npm start
-.PHONY: fakeissuer start migrate test npm clean lint default
+.PHONY: fakeissuer start migrate test npm clean lint default
View
@@ -125,7 +125,7 @@ and then back in windows you can fire up your favourite browser and connect to t
5. Run the test suite: `npm test`
-6. Start your server: `make start`
+6. Start your server: `npm start`
No matter which way you choose, you should join the
[Open Badges Google Group](https://groups.google.com/forum/#!forum/openbadges). If
@@ -161,7 +161,7 @@ migration. You can do this as follows:
5. Try rolling back your migration using `./bin/db-migrate down`.
-And finally, note that during development, `make start` automatically runs
+And finally, note that during development, `npm start` automatically runs
`./bin/db-migrate up` for you. For production use, you'll need to manually
run this command yourself whenever you deploy changes that involve a
schema change.
View
@@ -4,7 +4,8 @@
"version": "0.5.0",
"private": true,
"scripts": {
- "test": "NODE_ENV=test ./node_modules/.bin/tap test/*.test.js"
+ "test": "NODE_ENV=test ./node_modules/.bin/tap test/*.test.js",
+ "start": "./bin/db-migrate up && ./node_modules/.bin/up -w -n 1 -p 8888 app.js"
},
"devDependencies": {
"jshint": "~0.6.2",

0 comments on commit 44785f3

Please sign in to comment.