From b8f4feed153cea6039ef6550f758f5f37f45a414 Mon Sep 17 00:00:00 2001
From: Luis Merino <mail@luismerino.name>
Date: Thu, 7 Jul 2011 14:29:35 +0200
Subject: [PATCH] Added support for debugMode in FTP

---
 lib/DAV/tree/ftp.js |  3 +++
 support/node-ftp    |  2 +-
 test/test_ftp.js    | 54 ++++++++++++++++++++++-----------------------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/lib/DAV/tree/ftp.js b/lib/DAV/tree/ftp.js
index 3864c937..17405bd0 100644
--- a/lib/DAV/tree/ftp.js
+++ b/lib/DAV/tree/ftp.js
@@ -25,6 +25,9 @@ var jsDAV_Tree          = require("../tree").jsDAV_Tree,
  * @param {String} basePath
  * @contructor
  */
+
+Ftp.debugMode = require("../../jsdav").debugMode;
+ 
 function jsDAV_Tree_Ftp(options) {
     this.basePath = options.node || "";
     this.options = options.ftp;
diff --git a/support/node-ftp b/support/node-ftp
index 061e5442..5b222c8c 160000
--- a/support/node-ftp
+++ b/support/node-ftp
@@ -1 +1 @@
-Subproject commit 061e54427fe4279617b5b0616c1a9c0bec575761
+Subproject commit 5b222c8cf078ff5a8e0f66161cd1b8a39116330e
diff --git a/test/test_ftp.js b/test/test_ftp.js
index 12660f91..4ec15368 100644
--- a/test/test_ftp.js
+++ b/test/test_ftp.js
@@ -1,9 +1,9 @@
+
 var assert = require("assert");
-//var Ftp = require("./ftp");
-var Fs = require("fs");
-var exec = require('child_process').spawn;
-var jsDAV = require("./../lib/jsdav");
-//var Ftp = require("./../support/node-ftp").Ftp;
+var Fs     = require("fs");
+var exec   = require('child_process').spawn;
+var jsDAV  = require("./../lib/jsdav");
+var _      = require("../support/node-ftp/support/underscore");
 
 var _c = {
     host: "ftp.merino.ws",
@@ -17,34 +17,32 @@ jsDAV.debugMode = true;
 module.exports = {
     timeout: 10000,
 
-    setUp: function(next) {
-        exec('/bin/launchctl', ['load', '-w', '/System/Library/LaunchDaemons/ftp.plist']);
-
-        this.server = jsDAV.createServer({
+    setUpSuite: function(next) {
+        //exec('/bin/launchctl', ['load', '-w', '/System/Library/LaunchDaemons/ftp.plist']);
+        
+        var server = this.server = jsDAV.createServer({
             type: "ftp",
             ftp: {
-                host:   _c.host,
-                user:   _c.username,
+                host:     _c.host,
+                user:     _c.username,
                 password: _c.passwd,
-                port: _c.port,
-                node: "/c9"
+                port:     _c.port,
+                node:     "/c9"
             }
         }, 8000);
 
-        this.ftp = this.server.tree.ftp;
-
+        this.ftp = server.tree.ftp;
         next();
     },
 
-    tearDown: function(next) {
-        exec('/bin/launchctl', ['unload', '-w', '/System/Library/LaunchDaemons/ftp.plist']);
+    tearDownSuite: function(next) {
+        //exec('/bin/launchctl', ['unload', '-w', '/System/Library/LaunchDaemons/ftp.plist']);
+        
+        this.server.tree.unmount();
         this.server = null;
         next();
     },
-    /** Note: basically all tests can ass<ume user is authorized after this,
-      * because checkings are done in each required FTP method */
-    "test ftp connect": function(next) {
-        console.log(this.ftp)
+    "test Ftp connect": function(next) {
         var self = this;
         function assertError(e) {
             if (e) throw e;
@@ -52,20 +50,22 @@ module.exports = {
         };
 
         this.ftp.on("connect", function() {
-            console.log("FTP connected")
             next();
         });
-
         this.ftp.on("error", assertError)
         this.ftp.on("timeout", assertError)
 
         this.ftp.connect(_c.port, _c.host);
     },
-   "test User logs in, lists root directory, logs out": funciton() {
-        var self = this;
-        self.ftp.auth(_c.username, _c.passwd, function(err) {
+   "test User logs in, lists root directory, logs out": function(next) {
+        var _self = this;
+        this.ftp.auth(_c.username, _c.passwd, function(err) {
             assert.ok(!err);
-            next();
+            _self.ftp.readdir("/", function(err, nodes) {
+                assert.ok(!err);
+                assert.ok(_.isArray(nodes));
+                next();
+            });
         });
     }
 };