Added support for debugMode in FTP

standby · Jul 7, 2011 · b8f4fee · b8f4fee
1 parent bb57360
commit b8f4fee
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git 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
diff --git 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,55 +17,55 @@ 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;
  else throw new Error("FTP timed out.")
  };
 
  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();
+ });
  });
  }
 };