From c4bd2cb81f3c3b8e9291c309cc76df997ddc2be5 Mon Sep 17 00:00:00 2001
From: Anteoy <anteoy@gmail.com>
Date: Tue, 16 Jan 2018 23:20:56 +0800
Subject: [PATCH] update rabbitmqAppender test

---
 lib/appenders/rabbitmq.js         |  2 +-
 test/tap/rabbitmqAppender-test.js | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/appenders/rabbitmq.js b/lib/appenders/rabbitmq.js
index 1cba1ea..e174727 100644
--- a/lib/appenders/rabbitmq.js
+++ b/lib/appenders/rabbitmq.js
@@ -27,7 +27,7 @@ function rabbitmqAppender(config, layout) {
     durable: durable,
   };
   const clientconn = amqplib.connect(con);
-  clientconn.publish = (client, message) => {
+  clientconn.publish = amqplib.connect(con).publish ? amqplib.connect(con).publish : (client, message) => {
     client.then((conn) => {
       const rn = conn.createChannel().then((ch) => {
         const ok = ch.assertExchange(exchange, type, { durable: durable });
diff --git a/test/tap/rabbitmqAppender-test.js b/test/tap/rabbitmqAppender-test.js
index 1d04d75..85b97b4 100644
--- a/test/tap/rabbitmqAppender-test.js
+++ b/test/tap/rabbitmqAppender-test.js
@@ -15,12 +15,11 @@ function setupLogging(category, options) {
       this.exchange = conn.exchange;
       this.mq_type = conn.mq_type;
       this.durable = conn.durable;
-      const rn = new Promise(() => {
-      });
-      rn.publish = (client, message) => {
-        fakeRabbitmq.msgs.push(message);
+      return {
+        publish: function (client, message) {
+          fakeRabbitmq.msgs.push(message);
+        }
       };
-      return rn;
     }
   };
 
@@ -80,8 +79,8 @@ test('log4js rabbitmqAppender', (batch) => {
       assert.equal(result.fakeRabbitmq.exchange, 'exchange_logs');
       assert.equal(result.fakeRabbitmq.mq_type, 'direct');
       assert.equal(result.fakeRabbitmq.durable, true);
-      // assert.equal(result.fakeRabbitmq.msgs.length, 1, 'should be one message only');
-      // assert.equal(result.fakeRabbitmq.msgs[0], 'cheese Log event #1');
+      assert.equal(result.fakeRabbitmq.msgs.length, 1, 'should be one message only');
+      assert.equal(result.fakeRabbitmq.msgs[0], 'cheese Log event #1');
       assert.end();
     });
 
@@ -108,8 +107,8 @@ test('log4js rabbitmqAppender', (batch) => {
     });
 
     t.test('should use message pass through layout', (assert) => {
-      // assert.equal(setup.fakeRabbitmq.msgs.length, 1);
-      // assert.equal(setup.fakeRabbitmq.msgs[0], 'just testing');
+      assert.equal(setup.fakeRabbitmq.msgs.length, 1);
+      assert.equal(setup.fakeRabbitmq.msgs[0], 'just testing');
       assert.end();
     });