浏览代码

Merge pull request #2016 from cjnething/fix-nodejs-failures-round-13-preview-march-2016-jn

Make minor changes to fix local test run of nodejs
Mike Smith 9 年之前
父节点
当前提交
6380839090

+ 4 - 1
frameworks/JavaScript/nodejs/handlers/redis.js

@@ -2,7 +2,10 @@ var h = require('../helper');
 var async = require('async');
 // "If hiredis [pure C library] is installed, node_redis will use it by default.
 // Otherwise, a pure JavaScript parser will be used."
-// >> hiredis is installed for these tests
+// >> Previous versions of this project installed hiredis; however, hiredis now has
+// >> installation issues and redis is no longer tested, so the hiredis dependency was taken out.
+// >> If redis tests are re-instated, try to re-add hiredis dependency; however, if it does
+// >> not install correctly, the tests will still work with the redis default JS parser
 var redis = require('redis');
 var client = redis.createClient(6379, '127.0.0.1', {});
 

+ 2 - 3
frameworks/JavaScript/nodejs/package.json

@@ -6,7 +6,6 @@
     "async": "1.5.0",
     "bluebird": "^2.9.27",
     "handlebars": "^3.0.3",
-    "hiredis": "^0.4.0",
     "mongodb": "2.1.2",
     "mongoose": "4.3.4",
     "mysql": "2.7.0",
@@ -14,7 +13,7 @@
     "pg": "^4.4.3",
     "pg-hstore": "^2.3.2",
     "redis": "^0.12.1",
-    "sequelize": "3.1.1"
+    "sequelize": "3.6.0"
   },
-  "main": "hello.js"
+  "main": "app.js"
 }

+ 1 - 1
frameworks/JavaScript/nodejs/source_code

@@ -1 +1 @@
-./nodejs/hello.js
+./nodejs/app.js

+ 1 - 1
toolset/setup/linux/languages/nodejs.sh

@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/node.installed)
   source $IROOT/node.installed
   return 0; }
 
-VERSION="0.12.2"
+VERSION="0.12.12"
 
 fw_get -O http://nodejs.org/dist/v$VERSION/node-v$VERSION-linux-x64.tar.gz
 fw_untar node-v$VERSION-linux-x64.tar.gz