use package.json for installing npm modules

[mkws-moved-to-github.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 78bc630..1b76d34 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -38,21 +38,24 @@ screenshot:
 
 screenshot-mkws:
        for i in ${SCREENSHOT_WIDTH}; do \
-           ${PHANTOMJS} phantom/screenshot.js http://mkws.indexdata.com ${IMAGES}/mkws-$$i $$i 2800 & \
+           ${PHANTOMJS} phantom/screenshot.js http://mkws.indexdata.com ${IMAGES}/mkws-$$i.png $$i 1000 &  \
        done; wait
+       ls -l ${IMAGES}
+
 screenshot-indexdata:
        for i in ${SCREENSHOT_WIDTH}; do \
-           ${PHANTOMJS} phantom/screenshot.js http://www.indexdata.com ${IMAGES}/indexdata-$$i $$i 1200 & \
+           ${PHANTOMJS} phantom/screenshot.js http://www.indexdata.com ${IMAGES}/indexdata-$$i.png $$i 1000 &  \
        done; wait
+       ls -l ${IMAGES}
 
 jsbeautifier jsb indent:
-       for i in ./spec*/*.js ./js/*.js ./phantom/*.js; do \
+       for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
          jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
        done
 
 node-modules: node_modules
 node_modules:
-       npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node phantomjs
+       npm install ${NPM_INSTALL_FLAGS}
 
 help:
        @echo "make [ all | check | clean | distclean ]"