Skip to content

Commit

Permalink
Updates test dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>
  • Loading branch information
chrissrogers committed Jul 14, 2014
1 parent b9afa3c commit baadf46
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BIN= node_modules/.bin
COMPONENT= $(BIN)/component
MINIFY= $(BIN)/uglifyjs
DELEGATE= test test-browser test-sauce
BIN = node_modules/.bin
COMPONENT = $(BIN)/component
MINIFY = $(BIN)/uglifyjs
DELEGATE = test test-browser test-sauce

recurly.js: node_modules components $(SRC)
@$(COMPONENT) build --standalone recurly --name recurly --out .
Expand Down
19 changes: 10 additions & 9 deletions test/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
PORT= 8989
BIN= ../node_modules/.bin
PORT = 8989
PID = server/pid.txt
BIN = ../node_modules/.bin
BROWSERS ?= 'chrome, safari, firefox'
TEST= http://localhost:$(PORT)
COMPONENT= $(BIN)/component
GRAVY=$(BIN)/gravy
PHANTOMJS= $(BIN)/mocha-phantomjs \
TEST = http://localhost:$(PORT)
COMPONENT = $(BIN)/component
GRAVY = $(BIN)/gravy
PHANTOMJS = $(BIN)/mocha-phantomjs \
--setting local-to-remote-url-access=true \
--setting-web-security=false

Expand Down Expand Up @@ -35,9 +36,9 @@ clean: kill
rm -rf components build

kill:
-@test ! -e server/pid.txt || \
(kill `cat server/pid.txt` && \
rm -f server/pid.txt)
-@test ! -e $(PID) || \
(kill `cat $(PID)` && \
rm -f $(PID))

.PHONY: build
.PHONY: test-sauce test-coverage
Expand Down
2 changes: 1 addition & 1 deletion test/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"component/bind": "*",
"component/assert": "*",
"ianstormtaylor/sinon": "*",
"chrissrogers/sinon": "*",
"yields/gravy": "*",
"component/each": "*",
"chrissrogers/noop": "*",
Expand Down

0 comments on commit baadf46

Please sign in to comment.