[dist test] Move all transport unit tests into test/transports

winstonjs · Sep 12, 2011 · 1d2e300 · 1d2e300
1 parent 785d98d
commit 1d2e300
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/test/console-test.js → test/transports/console-test.js b/test/console-test.js → test/transports/console-test.js
@@ -9,8 +9,8 @@
 var path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('../lib/winston'),
-    helpers = require('./helpers');
+    winston = require('../../lib/winston'),
+    helpers = require('../helpers');
 
 var npmTransport = new (winston.transports.Console)(),
     syslogTransport = new (winston.transports.Console)({ levels: winston.config.syslog.levels });

diff --git a/test/couchdb-test.js → test/transports/couchdb-test.js b/test/couchdb-test.js → test/transports/couchdb-test.js
@@ -11,8 +11,8 @@ var path = require('path'),
     fs = require('fs'),
     http = require('http'),
     assert = require('assert'),
-    winston = require('../lib/winston'),
-    helpers = require('./helpers');
+    winston = require('../../lib/winston'),
+    helpers = require('../helpers');
 
 var couchdbTransport = new (winston.transports.Couchdb)({ 
   "host": "localhost",

diff --git a/test/file-maxsize-test.js → test/transports/file-maxsize-test.js b/test/file-maxsize-test.js → test/transports/file-maxsize-test.js
@@ -11,13 +11,13 @@ var assert = require('assert'),
     fs = require('fs'),
     path = require('path'),
     vows = require('vows'),
-    winston = require('../lib/winston'),
-    helpers = require('./helpers');
+    winston = require('../../lib/winston'),
+    helpers = require('../helpers');
 
 var maxsizeTransport = new winston.transports.File({
   timestamp: false,
   json: false,
-  filename: path.join(__dirname, 'fixtures', 'logs', 'testmaxsize.log'),
+  filename: path.join(__dirname, '..', 'fixtures', 'logs', 'testmaxsize.log'),
   maxsize: 4096
 });
 
@@ -26,7 +26,7 @@ vows.describe('winston/transports/file/maxsize').addBatch({
     "when passed a valid filename": {
       "the log() method": {
         topic: function () {
-          exec('rm -rf ' + path.join(__dirname, 'fixtures', 'logs', 'testmaxsize*'), this.callback);
+          exec('rm -rf ' + path.join(__dirname, '..', 'fixtures', 'logs', 'testmaxsize*'), this.callback);
         },
         "when passed more than the maxsize": {
           topic: function () {

diff --git a/test/file-test.js → test/transports/file-test.js b/test/file-test.js → test/transports/file-test.js
@@ -10,11 +10,11 @@ var path = require('path'),
     vows = require('vows'),
     fs = require('fs'),
     assert = require('assert'),
-    winston = require('../lib/winston'),
-    helpers = require('./helpers');
+    winston = require('../../lib/winston'),
+    helpers = require('../helpers');
 
-var stream = fs.createWriteStream(path.join(__dirname, 'fixtures', 'logs', 'testfile.log')),
-    fileTransport = new (winston.transports.File)({ filename: path.join(__dirname, 'fixtures', 'logs', 'testfilename.log') }),
+var stream = fs.createWriteStream(path.join(__dirname, '..', 'fixtures', 'logs', 'testfile.log')),
+    fileTransport = new (winston.transports.File)({ filename: path.join(__dirname, '..', 'fixtures', 'logs', 'testfilename.log') }),
     streamTransport = new (winston.transports.File)({ stream: stream });
 
 vows.describe('winston/transports/file').addBatch({

diff --git a/test/loggly-test.js → test/transports/loggly-test.js b/test/loggly-test.js → test/transports/loggly-test.js
@@ -9,8 +9,8 @@
 var path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('../lib/winston'),
-    helpers = require('./helpers');
+    winston = require('../../lib/winston'),
+    helpers = require('../helpers');
 
 var config = helpers.loadConfig(),
     tokenTransport = new (winston.transports.Loggly)({ 

diff --git a/test/webhook-test.js → test/transports/webhook-test.js b/test/webhook-test.js → test/transports/webhook-test.js
@@ -11,8 +11,8 @@ var path = require('path'),
     fs = require('fs'),
     http = require('http'),
     assert = require('assert'),
-    winston = require('../lib/winston'),
-    helpers = require('./helpers');
+    winston = require('../../lib/winston'),
+    helpers = require('../helpers');
 
 var webhookTransport = new (winston.transports.Webhook)({ 
   "host": "localhost",