Merge pull request #207 from chris-rock/sasl

update test to meet new sals separation between client and server
xmppjs · Dec 5, 2013 · 4e3444a · 4e3444a
2 parents b10bf0f + dbbec03
commit 4e3444a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 171 deletions.
diff --git a/package.json b/package.json
@@ -15,10 +15,10 @@
     "blueimp-md5": ">= 1.0.0",
     "browserify": "~2.35.0",
     "brfs": "0.0.8",
-    "node-xmpp-component": "~0.1.0",
-    "node-xmpp-client": "~0.1.0",
-    "node-xmpp-server": "~0.1.0",
-    "node-xmpp-core": "~0.1.0"
+    "node-xmpp-component": "~0.1.1",
+    "node-xmpp-client": "~0.1.2",
+    "node-xmpp-server": "~0.2.2",
+    "node-xmpp-core": "~0.2.1"
   },
   "devDependencies": {
     "mocha": ">=1.0.0",

diff --git a/test/bosh-test.js b/test/bosh-test.js
@@ -20,7 +20,7 @@ describe('BOSH client/server', function() {
             svcl = svcl_
             c2s = new C2SStream({ connection: svcl })
             c2s.on('authenticate', function(opts, cb) {
-                cb()
+                cb(null, opts)
             })
         })
 

diff --git a/test/sasl-test.js b/test/sasl-test.js
diff --git a/test/server-event-test.js b/test/server-event-test.js
@@ -26,7 +26,7 @@ function startServer() {
         // allow anything
         client.on('authenticate', function(opts, cb) {
             eventChain.push('authenticate')
-            cb(null)
+            cb(null, opts)
         })
 
         client.on('online', function() {

diff --git a/test/tcp-test.js b/test/tcp-test.js
@@ -21,7 +21,7 @@ describe('TCP client/server', function() {
             svcl = svcl_
             // Always authenticate
             svcl.on('authenticate', function(opts, cb) {
-                cb()
+                cb(null, opts)
             })
         })
         var cl

diff --git a/test/tls-test.js b/test/tls-test.js
@@ -39,7 +39,7 @@ function startServer(done) {
             if ((opts.saslmech = 'PLAIN') &&
                 (opts.jid.toString() === user.jid) &&
                 (opts.password === user.password)) {
-                cb(false)
+                cb(null, opts)
             } else {
                 cb(new Error('Authentication failure'))
             }