Fixed for node 0.8.x

liamoehlman · Aug 13, 2012 · d33941c · d33941c
1 parent 3ab4f99
commit d33941c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/lib/proxy.js b/lib/proxy.js
@@ -7,9 +7,9 @@ var Nginx = module.exports = exports = function(dir) {
   this.dir = dir;
   this.rules = [];
   this.conf = path.join(dir, 'rules.json');
-
-  if (!path.existsSync(this.conf)){
-    fs.writeFileSync(this.conf, '');
+ 
+  if (!fs.existsSync(this.conf)){
+    fs.writeFileSync(this.conf, '{}');
   } else {
     this.rules = JSON.parse(fs.readFileSync(this.conf));
   }
@@ -123,7 +123,7 @@ Nginx.prototype.update = function(callback) {
     callback = function(){}
   }
 
-  var file = template(routes);
+  //var file = template(routes);
 
   fs.writeFileSync(path.join(this.dir, 'conf', 'upstream'), upstreamTemplate(routes));
   fs.writeFileSync(path.join(this.dir, 'conf', 'location'), locationTemplate(routes));

diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
 
     "devDependencies": {
         "request": "2.x.x",
-        "mocha": ">=11.0",
+        "mocha": ">=1.0",
         "request": ">=2.9.0",
         "express" : ">=2.5.8"
     }
-}
+}
diff --git a/test/routes.js b/test/routes.js
@@ -17,15 +17,27 @@ before(function() {
   var upstream = path.join(__dirname, 'nginx', 'conf', 'upstream')
     , location = path.join(__dirname, 'nginx', 'conf', 'location')
 
-  fs.unlinkSync(location);
-  fs.writeFileSync(location, '');
-  fs.unlinkSync(upstream);
-  fs.writeFileSync(upstream, '');
+// override the changes
+  if (fs.existsSync(location)) {
+    console.log("exists");
+    fs.unlinkSync(location);
+    fs.writeFileSync(location, '');    
+  } else {
+    fs.writeFileSync(location, '');  
+  } // if...else
 
+  if (fs.existsSync(upstream)) {
+    fs.unlinkSync(upstream);
+    fs.writeFileSync(upstream, '');  
+  } else {
+    fs.writeFileSync(upstream, '');
+  }
+
   exec('nginx -p ' + path.join(__dirname, '/nginx/'), function(err, stdout, stderr) {
     if (err) {
       console.log(err);
     }
+    console.log("nginx dir " + path.join(__dirname, '/nginx/'));
   });
   server = spawn('node', [path.join(__dirname, 'server', 'server.js')]);
   nginx.rules = [];

diff --git a/test/server/server.js b/test/server/server.js
@@ -1,7 +1,7 @@
 var express = require('express')
-  , server1 = express.createServer()
-  , server2 = express.createServer()
-  , server3 = express.createServer();
+  , server1 = express()
+  , server2 = express()
+  , server3 = express();
 
 // set up three servers for the tests