Haraka 3.2.1 → 3.3.1

package/test/plugins/process_title.js

@@ -4,6 +4,7 @@ const assert = require('node:assert/strict')
 const { describe, it, beforeEach } = require('node:test')
 
 const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = fixtures
 const Notes = require('haraka-notes')
 
 function makeServer(extra = {}) {
@@ -30,13 +31,14 @@ describe('process_title', () => {
     let plugin
 
     beforeEach(() => {
-        plugin = new fixtures.plugin('process_title')
+        plugin = makePlugin('process_title', { register: false })
     })
 
     describe('hook_connect_init', () => {
         it('increments connection and concurrent counts', (t, done) => {
             const server = makeServer()
-            const conn = fixtures.connection.createConnection({}, server)
+            const conn = makeConnection()
+            conn.server = server
             plugin.hook_connect_init((rc) => {
                 assert.equal(rc, undefined)
                 assert.equal(server.notes.pt_connections, 1)
@@ -50,7 +52,8 @@ describe('process_title', () => {
     describe('hook_disconnect', () => {
         it('decrements concurrent count when connect_init ran', (t, done) => {
             const server = makeServer({ pt_connections: 1, pt_concurrent: 1 })
-            const conn = fixtures.connection.createConnection({}, server)
+            const conn = makeConnection()
+            conn.server = server
             conn.notes.pt_connect_run = true
             plugin.hook_disconnect((rc) => {
                 assert.equal(rc, undefined)
@@ -62,7 +65,8 @@ describe('process_title', () => {
 
         it('increments connection count when connect_init did not run', (t, done) => {
             const server = makeServer({ pt_connections: 0, pt_concurrent: 0 })
-            const conn = fixtures.connection.createConnection({}, server)
+            const conn = makeConnection()
+            conn.server = server
             // pt_connect_run is NOT set: disconnect does connect bookkeeping then decrements
             plugin.hook_disconnect((rc) => {
                 assert.equal(rc, undefined)
@@ -76,7 +80,8 @@ describe('process_title', () => {
     describe('hook_rcpt', () => {
         it('increments recipient count', (t, done) => {
             const server = makeServer()
-            const conn = fixtures.connection.createConnection({}, server)
+            const conn = makeConnection()
+            conn.server = server
             plugin.hook_rcpt((rc) => {
                 assert.equal(rc, undefined)
                 assert.equal(server.notes.pt_recipients, 1)
@@ -88,7 +93,8 @@ describe('process_title', () => {
     describe('hook_data', () => {
         it('increments message count', (t, done) => {
             const server = makeServer()
-            const conn = fixtures.connection.createConnection({}, server)
+            const conn = makeConnection()
+            conn.server = server
             plugin.hook_data((rc) => {
                 assert.equal(rc, undefined)
                 assert.equal(server.notes.pt_messages, 1)

package/test/plugins/queue/deliver.js

@@ -5,7 +5,7 @@ const path = require('node:path')
 const Module = require('node:module')
 const { describe, it, beforeEach, before, after } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 // deliver.js does `require('./outbound')` at the top level. In a running
 // Haraka that resolves to the core outbound module (Haraka/outbound/index.js),
@@ -40,9 +40,8 @@ after(() => {
     delete require.cache[outboundPath]
 })
 
-function makeConnection(opts = {}) {
-    const conn = fixtures.connection.createConnection()
-    conn.init_transaction()
+function buildConnection(opts = {}) {
+    const conn = makeConnection({ withTxn: true })
     if (opts.relaying !== undefined) conn.relaying = opts.relaying
     return conn
 }
@@ -52,12 +51,12 @@ describe('queue/deliver', () => {
         let plugin, conn
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/deliver')
+            plugin = makePlugin('queue/deliver')
             mockOutbound.send_trans_email = () => {}
         })
 
         it('calls next() when connection is not relaying', (t, done) => {
-            conn = makeConnection({ relaying: false })
+            conn = buildConnection({ relaying: false })
             plugin.hook_queue_outbound((rc) => {
                 assert.equal(rc, undefined)
                 done()
@@ -72,7 +71,7 @@ describe('queue/deliver', () => {
         })
 
         it('calls outbound.send_trans_email when relaying is true', (t, done) => {
-            conn = makeConnection({ relaying: true })
+            conn = buildConnection({ relaying: true })
             mockOutbound.send_trans_email = (txn, next) => {
                 assert.equal(txn, conn.transaction)
                 next(OK)
@@ -84,7 +83,7 @@ describe('queue/deliver', () => {
         })
 
         it('passes transaction to outbound.send_trans_email', (t, done) => {
-            conn = makeConnection({ relaying: true })
+            conn = buildConnection({ relaying: true })
             let capturedTxn
             mockOutbound.send_trans_email = (txn, next) => {
                 capturedTxn = txn

package/test/plugins/queue/discard.js

@@ -3,7 +3,7 @@
 const assert = require('node:assert')
 const { describe, it, beforeEach, before } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 before(() => {
     require('haraka-constants').import(global)
@@ -14,9 +14,8 @@ describe('queue/discard', () => {
         let plugin, conn
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/discard')
-            conn = fixtures.connection.createConnection()
-            conn.init_transaction()
+            plugin = makePlugin('queue/discard')
+            conn = makeConnection({ withTxn: true })
             delete process.env.YES_REALLY_DO_DISCARD
         })
 

package/test/plugins/queue/lmtp.js

@@ -3,7 +3,7 @@
 const assert = require('node:assert')
 const { describe, it, beforeEach, before } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 before(() => {
     require('haraka-constants').import(global)
@@ -14,7 +14,7 @@ describe('queue/lmtp', () => {
         let plugin
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/lmtp')
+            plugin = makePlugin('queue/lmtp', { register: false })
             plugin.load_lmtp_ini()
         })
 
@@ -113,14 +113,13 @@ describe('queue/lmtp', () => {
         let plugin, conn
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/lmtp')
+            plugin = makePlugin('queue/lmtp', { register: false })
             plugin.load_lmtp_ini()
-            conn = fixtures.connection.createConnection()
-            conn.init_transaction()
+            conn = makeConnection({ withTxn: true })
         })
 
         it('calls next() when there is no transaction', (t, done) => {
-            const connNoTxn = fixtures.connection.createConnection()
+            const connNoTxn = makeConnection()
             plugin.hook_queue((rc) => {
                 assert.equal(rc, undefined)
                 done()

package/test/plugins/queue/qmail-queue.js

@@ -3,7 +3,7 @@
 const assert = require('node:assert')
 const { describe, it, beforeEach, before } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 before(() => {
     require('haraka-constants').import(global)
@@ -12,14 +12,14 @@ before(() => {
 describe('queue/qmail-queue', () => {
     describe('register', () => {
         it('throws when qmail-queue binary is not found', () => {
-            const plugin = new fixtures.plugin('queue/qmail-queue')
+            const plugin = makePlugin('queue/qmail-queue', { register: false })
             assert.throws(() => plugin.register(), /Cannot find qmail-queue binary/)
         })
     })
 
     describe('load_qmail_queue_ini', () => {
         it('loads config with enable_outbound boolean', () => {
-            const plugin = new fixtures.plugin('queue/qmail-queue')
+            const plugin = makePlugin('queue/qmail-queue', { register: false })
             plugin.load_qmail_queue_ini()
             assert.ok(typeof plugin.cfg.main.enable_outbound === 'boolean')
         })
@@ -29,15 +29,14 @@ describe('queue/qmail-queue', () => {
         let plugin, conn
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/qmail-queue')
+            plugin = makePlugin('queue/qmail-queue', { register: false })
             plugin.load_qmail_queue_ini()
             plugin.queue_exec = '/bin/echo' // use a real binary that exists
-            conn = fixtures.connection.createConnection()
-            conn.init_transaction()
+            conn = makeConnection({ withTxn: true })
         })
 
         it('calls next() when there is no transaction', (t, done) => {
-            const connNoTxn = fixtures.connection.createConnection()
+            const connNoTxn = makeConnection()
             plugin.hook_queue((rc) => {
                 assert.equal(rc, undefined)
                 done()
@@ -64,7 +63,7 @@ describe('queue/qmail-queue', () => {
     describe('build_envelope', () => {
         let plugin
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/qmail-queue')
+            plugin = makePlugin('queue/qmail-queue', { register: false })
         })
 
         it('formats F<sender>\\0(T<rcpt>\\0)*\\0 with no padding', () => {

package/test/plugins/queue/quarantine.js

@@ -3,13 +3,13 @@
 const assert = require('node:assert')
 const { describe, it, beforeEach } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 describe('queue/quarantine', () => {
     let plugin
 
     beforeEach(() => {
-        plugin = new fixtures.plugin('queue/quarantine')
+        plugin = makePlugin('queue/quarantine', { register: false })
         plugin.load_quarantine_ini()
     })
 
@@ -51,8 +51,7 @@ describe('queue/quarantine', () => {
         let conn
 
         beforeEach(() => {
-            conn = fixtures.connection.createConnection()
-            conn.init_transaction()
+            conn = makeConnection({ withTxn: true })
         })
 
         it('calls next() when no quarantine conditions are met', (t, done) => {

package/test/plugins/queue/smtp_bridge.js

@@ -3,7 +3,7 @@
 const assert = require('node:assert')
 const { describe, it, beforeEach, before } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 before(() => {
     require('haraka-constants').import(global)
@@ -14,14 +14,13 @@ describe('queue/smtp_bridge', () => {
         let plugin, conn
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/smtp_bridge')
+            plugin = makePlugin('queue/smtp_bridge')
             plugin.load_flat_ini()
-            conn = fixtures.connection.createConnection()
-            conn.init_transaction()
+            conn = makeConnection({ withTxn: true })
         })
 
         it('calls next() when no transaction', (t, done) => {
-            const connNoTxn = fixtures.connection.createConnection()
+            const connNoTxn = makeConnection()
             plugin.hook_data_post((rc) => {
                 assert.equal(rc, undefined)
                 done()
@@ -60,8 +59,7 @@ describe('queue/smtp_bridge', () => {
         let plugin
 
         beforeEach(() => {
-            plugin = new fixtures.plugin('queue/smtp_bridge')
-            plugin.load_flat_ini()
+            plugin = makePlugin('queue/smtp_bridge')
         })
 
         it('returns OK with default priority 10 and configured host', (t, done) => {

package/test/plugins/queue/smtp_forward.js

@@ -5,8 +5,8 @@ const assert = require('node:assert/strict')
 const { EventEmitter } = require('node:events')
 const path = require('node:path')
 
-const { Address } = require('../../../address')
-const fixtures = require('haraka-test-fixtures')
+const { Address } = require('@haraka/email-address')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 const Notes = require('haraka-notes')
 
 // Haraka result codes (haraka-constants)
@@ -16,21 +16,8 @@ const DENYSOFT = 903
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
-function makePlugin() {
-    const p = new fixtures.plugin('queue/smtp_forward')
-    p.config = p.config.module_config(path.resolve('test'))
-    p.register()
-    // Deep-clone cfg to prevent shared haraka-config reference mutations across tests
-    p.cfg = JSON.parse(JSON.stringify(p.cfg))
-    return p
-}
-
-function makeConnection() {
-    const conn = fixtures.connection.createConnection()
-    conn.init_transaction()
-    conn.server = { notes: {} }
-    return conn
-}
+// repo `test/` dir (holds config/), independent of cwd
+const TEST_DIR = path.resolve(__dirname, '../..')
 
 function makeHmail(notes = {}) {
     const n = new Notes()
@@ -68,7 +55,7 @@ class MockSMTPClient extends EventEmitter {
         this.commands.push(data !== undefined ? `${cmd} ${data}` : cmd)
     }
 
-    start_data(stream) {
+    start_data() {
         this.started = true
     }
 }
@@ -88,18 +75,17 @@ function stubGetClientPlugin(factory) {
 
 describe('smtp_forward register', () => {
     it('registers the queue hook', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         assert.ok(plugin.hooks.queue)
     })
 
     it('registers the get_mx hook', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         assert.ok(plugin.hooks.get_mx)
     })
 
     it('registers check_sender hook when check_sender=true', () => {
-        const plugin = new fixtures.plugin('queue/smtp_forward')
-        plugin.config = plugin.config.module_config(path.resolve('test'))
+        const plugin = makePlugin('queue/smtp_forward', { register: false, configDir: TEST_DIR })
         plugin.load_smtp_forward_ini = function () {
             this.cfg = {
                 main: { check_sender: true, check_recipient: true, enable_outbound: true, host: 'localhost', port: 25 },
@@ -110,8 +96,7 @@ describe('smtp_forward register', () => {
     })
 
     it('registers check_recipient hook when check_recipient=true', () => {
-        const plugin = new fixtures.plugin('queue/smtp_forward')
-        plugin.config = plugin.config.module_config(path.resolve('test'))
+        const plugin = makePlugin('queue/smtp_forward', { register: false, configDir: TEST_DIR })
         plugin.load_smtp_forward_ini = function () {
             this.cfg = { main: { check_recipient: true, host: 'localhost', port: 25 } }
         }
@@ -120,8 +105,7 @@ describe('smtp_forward register', () => {
     })
 
     it('registers queue_outbound hook when enable_outbound=true', () => {
-        const plugin = new fixtures.plugin('queue/smtp_forward')
-        plugin.config = plugin.config.module_config(path.resolve('test'))
+        const plugin = makePlugin('queue/smtp_forward', { register: false, configDir: TEST_DIR })
         plugin.load_smtp_forward_ini = function () {
             this.cfg = { main: { enable_outbound: true, host: 'localhost', port: 25 } }
         }
@@ -130,8 +114,7 @@ describe('smtp_forward register', () => {
     })
 
     it('aborts registration when load_errs is non-empty', () => {
-        const plugin = new fixtures.plugin('queue/smtp_forward')
-        plugin.config = plugin.config.module_config(path.resolve('test'))
+        const plugin = makePlugin('queue/smtp_forward', { register: false, configDir: TEST_DIR })
         plugin.load_smtp_forward_ini = function () {
             this.cfg = { main: {} }
             this.load_errs.push('simulated error')
@@ -141,7 +124,7 @@ describe('smtp_forward register', () => {
     })
 
     it('populates tls_options after register (no-op shape)', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         assert.ok(plugin.tls_options, 'tls_options should be populated after register')
         assert.ok(Array.isArray(plugin.tls_options.no_tls_hosts))
         assert.ok(Array.isArray(plugin.tls_options.force_tls_hosts))
@@ -158,7 +141,7 @@ describe('smtp_forward tls_options', () => {
         // Redirect tls_socket.config at test/config so tls.ini fixtures load.
         origTlsConfig = tls_socket.config
         origTlsCfg = tls_socket.cfg
-        tls_socket.config = require('haraka-config').module_config(path.resolve('test'))
+        tls_socket.config = require('haraka-config').module_config(TEST_DIR)
         tls_socket.cfg = undefined
     })
 
@@ -168,14 +151,14 @@ describe('smtp_forward tls_options', () => {
     })
 
     it('inherits rejectUnauthorized/minVersion/ciphers from tls.ini [main]', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         assert.equal(plugin.tls_options.rejectUnauthorized, false)
         assert.equal(plugin.tls_options.minVersion, 'TLSv1')
         assert.ok(plugin.tls_options.ciphers)
     })
 
     it('reload re-derives tls_options', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         const first = plugin.tls_options
         plugin.load_smtp_forward_ini()
         assert.ok(plugin.tls_options)
@@ -188,14 +171,14 @@ describe('smtp_forward tls_options', () => {
 
 describe('smtp_forward load_smtp_forward_ini', () => {
     it('loads configuration from ini file', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         assert.ok(plugin.cfg.main)
         assert.equal(plugin.cfg.main.host, 'localhost')
     })
 
     it('sets up a reload callback', () => {
         // Calling load_smtp_forward_ini again should not crash
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         assert.doesNotThrow(() => plugin.load_smtp_forward_ini())
         assert.ok(plugin.cfg.main)
     })
@@ -207,8 +190,9 @@ describe('smtp_forward get_config', () => {
     let plugin, connection
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        plugin.cfg = JSON.parse(JSON.stringify(plugin.cfg))
+        connection = makeConnection({ withTxn: true })
     })
 
     it('returns main cfg when no transaction', () => {
@@ -284,8 +268,8 @@ describe('smtp_forward check_sender', () => {
     let plugin, connection
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        connection = makeConnection({ withTxn: true })
     })
 
     it('returns without calling next when no transaction', () => {
@@ -363,8 +347,9 @@ describe('smtp_forward set_queue', () => {
     let plugin, connection
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        plugin.cfg = JSON.parse(JSON.stringify(plugin.cfg))
+        connection = makeConnection({ withTxn: true })
     })
 
     it('returns false when transaction has no notes (no transaction)', () => {
@@ -440,8 +425,8 @@ describe('smtp_forward check_recipient', () => {
     let plugin, connection
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        connection = makeConnection({ withTxn: true })
     })
 
     it('returns without calling next when no transaction', () => {
@@ -532,8 +517,8 @@ describe('smtp_forward auth', () => {
     let plugin, connection, smtp_client
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        connection = makeConnection({ withTxn: true })
         smtp_client = new MockSMTPClient()
     })
 
@@ -603,8 +588,9 @@ describe('smtp_forward forward_enabled', () => {
     let plugin, connection
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        plugin.cfg = JSON.parse(JSON.stringify(plugin.cfg))
+        connection = makeConnection({ withTxn: true })
     })
 
     it('returns false when queue.wants is set to a non smtp_forward value', () => {
@@ -641,10 +627,12 @@ describe('smtp_forward queue_forward', () => {
     let plugin, connection, restore
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
-        connection.transaction.rcpt_to = [new Address('<rcpt@example.com>')]
-        connection.transaction.mail_from = new Address('<sender@example.com>')
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        plugin.cfg = JSON.parse(JSON.stringify(plugin.cfg))
+        connection = makeConnection({
+            mailFrom: '<sender@example.com>',
+            rcptTo: ['<rcpt@example.com>'],
+        })
         connection.relaying = false
     })
 
@@ -839,8 +827,7 @@ describe('smtp_forward queue_forward', () => {
 
 describe('smtp_forward get_mx_next_hop', () => {
     it('parses smtp URL with port', () => {
-        const mx = smtp_client_mod.smtp_client // not used; just accessing exports
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         const mx_val = plugin.get_mx_next_hop('smtp://10.0.0.1:587')
         assert.equal(mx_val.exchange, '10.0.0.1')
         assert.equal(mx_val.port, '587')
@@ -848,20 +835,20 @@ describe('smtp_forward get_mx_next_hop', () => {
     })
 
     it('defaults port to 25 for smtp without explicit port', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         const mx_val = plugin.get_mx_next_hop('smtp://10.0.0.1')
         assert.equal(mx_val.port, 25)
     })
 
     it('parses lmtp URL and sets using_lmtp=true with port 24', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         const mx_val = plugin.get_mx_next_hop('lmtp://10.0.0.2')
         assert.equal(mx_val.using_lmtp, true)
         assert.equal(mx_val.port, 24)
     })
 
     it('extracts auth credentials from URL', () => {
-        const plugin = makePlugin()
+        const plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
         const mx_val = plugin.get_mx_next_hop('smtp://user:secret@10.0.0.1:25')
         assert.equal(mx_val.auth_type, 'plain')
         assert.equal(mx_val.auth_user, 'user')
@@ -875,7 +862,8 @@ describe('smtp_forward get_mx', () => {
     let plugin, hmail
 
     beforeEach(() => {
-        plugin = makePlugin()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        plugin.cfg = JSON.parse(JSON.stringify(plugin.cfg))
         hmail = makeHmail()
     })
 
@@ -894,7 +882,7 @@ describe('smtp_forward get_mx', () => {
     it('returns no route when queue.wants is not smtp_forward or outbound', (t, done) => {
         hmail.todo.notes.set('queue.wants', 'some_other_queue')
         plugin.get_mx(
-            (code, mx) => {
+            (code) => {
                 assert.equal(code, undefined)
                 done()
             },
@@ -936,7 +924,7 @@ describe('smtp_forward get_mx', () => {
     it('returns no route (DNS MX) for unconfigured domain when queue.wants=outbound', (t, done) => {
         hmail.todo.notes.set('queue.wants', 'outbound')
         plugin.get_mx(
-            (code, mx) => {
+            (code) => {
                 assert.equal(code, undefined)
                 done()
             },
@@ -996,8 +984,9 @@ describe('smtp_forward is_outbound_enabled', () => {
     let plugin, connection
 
     beforeEach(() => {
-        plugin = makePlugin()
-        connection = makeConnection()
+        plugin = makePlugin('queue/smtp_forward', { configDir: TEST_DIR })
+        plugin.cfg = JSON.parse(JSON.stringify(plugin.cfg))
+        connection = makeConnection({ withTxn: true })
     })
 
     it('enable_outbound is false by default (global)', () => {

package/test/plugins/queue/smtp_proxy.js

@@ -4,7 +4,7 @@ const assert = require('node:assert')
 const path = require('node:path')
 const { describe, it, beforeEach, afterEach, before } = require('node:test')
 
-const fixtures = require('haraka-test-fixtures')
+const { makeConnection, makePlugin } = require('haraka-test-fixtures')
 
 const tls_socket = require('../../../tls_socket')
 
@@ -16,10 +16,9 @@ describe('queue/smtp_proxy', () => {
     let plugin, conn
 
     beforeEach(() => {
-        plugin = new fixtures.plugin('queue/smtp_proxy')
+        plugin = makePlugin('queue/smtp_proxy', { register: false })
         plugin.load_smtp_proxy_ini()
-        conn = fixtures.connection.createConnection()
-        conn.init_transaction()
+        conn = makeConnection({ withTxn: true })
     })
 
     describe('hook_rset', () => {
@@ -37,7 +36,7 @@ describe('queue/smtp_proxy', () => {
                     released = true
                 },
             }
-            plugin.hook_rset((rc) => {
+            plugin.hook_rset(() => {
                 assert.equal(released, true)
                 assert.equal(conn.notes.smtp_client, undefined)
                 done()
@@ -77,7 +76,7 @@ describe('queue/smtp_proxy', () => {
                     callNextCalled = true
                 },
             }
-            plugin.hook_disconnect((rc) => {
+            plugin.hook_disconnect(() => {
                 assert.equal(released, true)
                 assert.equal(callNextCalled, true)
                 assert.equal(conn.notes.smtp_client, undefined)
@@ -88,7 +87,7 @@ describe('queue/smtp_proxy', () => {
 
     describe('hook_queue', () => {
         it('calls next() when transaction is missing', (t, done) => {
-            const connNoTxn = fixtures.connection.createConnection()
+            const connNoTxn = makeConnection()
             plugin.hook_queue((rc) => {
                 assert.equal(rc, undefined)
                 done()