Haraka 3.1.4 → 3.1.5

package/test/outbound/bounce_net_errors.js

@@ -26,151 +26,107 @@ const queue_dir = path.resolve(__dirname, '../test-queue')
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
-const ensureQueueDir = () =>
+const ensureQueueDir = () => fs.promises.mkdir(queue_dir, { recursive: true })
+
+const cleanQueueDir = async () => {
+    if (!fs.existsSync(queue_dir)) return
+    for (const file of fs.readdirSync(queue_dir)) {
+        const full = path.resolve(queue_dir, file)
+        if (fs.lstatSync(full).isDirectory()) throw new Error(`unexpected subdirectory: ${full}`)
+        fs.unlinkSync(full)
+    }
+}
+
+/** Creates a mock HMailItem, resolving with it or rejecting on error. */
+const mockHMailItem = (ctx, opts = {}) =>
     new Promise((resolve, reject) => {
-        fs.exists(queue_dir, (exists) => {
-            if (exists) return resolve()
-            fs.mkdir(queue_dir, (err) => (err ? reject(err) : resolve()))
-        })
+        util_hmailitem.newMockHMailItem(ctx, reject, opts, resolve)
     })
 
-const cleanQueueDir = () =>
+/**
+ * Intercepts `HMailItem.prototype[method]`, calls `assertion(this)` when invoked,
+ * then triggers the action under test via `trigger()`.
+ */
+const interceptAndAssert = (method, assertion, trigger) =>
     new Promise((resolve, reject) => {
-        fs.exists(queue_dir, (exists) => {
-            if (!exists) return resolve()
+        const orig = HMailItem.prototype[method]
+        HMailItem.prototype[method] = function () {
             try {
-                for (const file of fs.readdirSync(queue_dir)) {
-                    const full = path.resolve(queue_dir, file)
-                    if (fs.lstatSync(full).isDirectory()) return reject(new Error(`unexpected subdirectory: ${full}`))
-                    fs.unlinkSync(full)
-                }
+                assertion(this)
                 resolve()
-            } catch (err) {
-                reject(err)
+            } catch (e) {
+                reject(e)
+            } finally {
+                HMailItem.prototype[method] = orig
             }
-        })
-    })
-
-/** Creates a mock HMailItem, resolving with it or rejecting on error. */
-const mockHMailItem = (ctx, opts = {}) =>
-    new Promise((resolve, reject) => {
-        util_hmailitem.newMockHMailItem(ctx, reject, opts, resolve)
+        }
+        trigger()
     })
 
 // ── Tests ─────────────────────────────────────────────────────────────────────
 
+// [method, dsn_status, optional setup fn, trigger fn, test name]
+const testCases = [
+    {
+        name: 'get_mx=DENY triggers bounce with dsn_status 5.1.2',
+        method: 'bounce',
+        status: '5.1.2',
+        setup: (h) => {
+            h.domain = h.todo.domain
+        },
+        trigger: (h) => HMailItem.prototype.get_mx_respond.apply(h, [constants.deny, {}]),
+    },
+    {
+        name: 'get_mx=DENYSOFT triggers temp_fail with dsn_status 4.1.2',
+        method: 'temp_fail',
+        status: '4.1.2',
+        setup: (h) => {
+            h.domain = h.todo.domain
+        },
+        trigger: (h) => HMailItem.prototype.get_mx_respond.apply(h, [constants.denysoft, {}]),
+    },
+    {
+        name: 'get_mx_error({code:NXDOMAIN}) triggers bounce with dsn_status 5.1.2',
+        method: 'bounce',
+        status: '5.1.2',
+        trigger: (h) => HMailItem.prototype.get_mx_error.apply(h, [{ code: dns.NXDOMAIN }]),
+    },
+    {
+        name: "get_mx_error({code:'SOME-OTHER-ERR'}) triggers temp_fail with dsn_status 4.1.0",
+        method: 'temp_fail',
+        status: '4.1.0',
+        trigger: (h) => HMailItem.prototype.get_mx_error.apply(h, [{ code: 'SOME-OTHER-ERR' }, {}]),
+    },
+    {
+        name: 'found_mx with empty exchange triggers bounce with dsn_status 5.1.2',
+        method: 'bounce',
+        status: '5.1.2',
+        trigger: (h) => HMailItem.prototype.found_mx.apply(h, [[{ priority: 0, exchange: '' }]]),
+    },
+    {
+        name: 'try_deliver with empty mxlist triggers temp_fail with dsn_status 5.1.2',
+        method: 'temp_fail',
+        status: '5.1.2',
+        setup: (h) => {
+            h.mxlist = []
+        },
+        trigger: (h) => HMailItem.prototype.try_deliver.apply(h, []),
+    },
+]
+
 describe('outbound_bounce_net_errors', () => {
     beforeEach(ensureQueueDir)
     afterEach(cleanQueueDir)
 
-    it('get_mx=DENY triggers bounce with dsn_status 5.1.2', async () => {
-        const mock_hmail = await mockHMailItem(outbound_context)
-        await new Promise((resolve, reject) => {
-            const orig = HMailItem.prototype.bounce
-            HMailItem.prototype.bounce = function (err, opts) {
-                try {
-                    assert.equal(this.todo.rcpt_to[0].dsn_status, '5.1.2', 'dsn status')
-                    resolve()
-                } catch (e) {
-                    reject(e)
-                } finally {
-                    HMailItem.prototype.bounce = orig
-                }
-            }
-            mock_hmail.domain = mock_hmail.todo.domain
-            HMailItem.prototype.get_mx_respond.apply(mock_hmail, [constants.deny, {}])
-        })
-    })
-
-    it('get_mx=DENYSOFT triggers temp_fail with dsn_status 4.1.2', async () => {
-        const mock_hmail = await mockHMailItem(outbound_context)
-        await new Promise((resolve, reject) => {
-            const orig = HMailItem.prototype.temp_fail
-            HMailItem.prototype.temp_fail = function (err, opts) {
-                try {
-                    assert.equal(this.todo.rcpt_to[0].dsn_status, '4.1.2', 'dsn status')
-                    resolve()
-                } catch (e) {
-                    reject(e)
-                } finally {
-                    HMailItem.prototype.temp_fail = orig
-                }
-            }
-            mock_hmail.domain = mock_hmail.todo.domain
-            HMailItem.prototype.get_mx_respond.apply(mock_hmail, [constants.denysoft, {}])
-        })
-    })
-
-    it('get_mx_error({code:NXDOMAIN}) triggers bounce with dsn_status 5.1.2', async () => {
-        const mock_hmail = await mockHMailItem(outbound_context)
-        await new Promise((resolve, reject) => {
-            const orig = HMailItem.prototype.bounce
-            HMailItem.prototype.bounce = function (err, opts) {
-                try {
-                    assert.equal(this.todo.rcpt_to[0].dsn_status, '5.1.2', 'dsn status')
-                    resolve()
-                } catch (e) {
-                    reject(e)
-                } finally {
-                    HMailItem.prototype.bounce = orig
-                }
-            }
-            HMailItem.prototype.get_mx_error.apply(mock_hmail, [{ code: dns.NXDOMAIN }])
-        })
-    })
-
-    it("get_mx_error({code:'SOME-OTHER-ERR'}) triggers temp_fail with dsn_status 4.1.0", async () => {
-        const mock_hmail = await mockHMailItem(outbound_context)
-        await new Promise((resolve, reject) => {
-            const orig = HMailItem.prototype.temp_fail
-            HMailItem.prototype.temp_fail = function (err, opts) {
-                try {
-                    assert.equal(this.todo.rcpt_to[0].dsn_status, '4.1.0', 'dsn status')
-                    resolve()
-                } catch (e) {
-                    reject(e)
-                } finally {
-                    HMailItem.prototype.temp_fail = orig
-                }
-            }
-            HMailItem.prototype.get_mx_error.apply(mock_hmail, [{ code: 'SOME-OTHER-ERR' }, {}])
+    for (const { name, method, status, setup, trigger } of testCases) {
+        it(name, async () => {
+            const mock_hmail = await mockHMailItem(outbound_context)
+            if (setup) setup(mock_hmail)
+            await interceptAndAssert(
+                method,
+                (h) => assert.equal(h.todo.rcpt_to[0].dsn_status, status, 'dsn_status'),
+                () => trigger(mock_hmail),
+            )
         })
-    })
-
-    it("found_mx(null, [{priority:0,exchange:''}]) triggers bounce with dsn_status 5.1.2", async () => {
-        const mock_hmail = await mockHMailItem(outbound_context)
-        await new Promise((resolve, reject) => {
-            const orig = HMailItem.prototype.bounce
-            HMailItem.prototype.bounce = function (err, opts) {
-                try {
-                    assert.equal(this.todo.rcpt_to[0].dsn_status, '5.1.2', 'dsn status')
-                    resolve()
-                } catch (e) {
-                    reject(e)
-                } finally {
-                    HMailItem.prototype.bounce = orig
-                }
-            }
-            HMailItem.prototype.found_mx.apply(mock_hmail, [[{ priority: 0, exchange: '' }]])
-        })
-    })
-
-    it('try_deliver with empty mxlist triggers temp_fail with dsn_status 5.1.2', async () => {
-        const mock_hmail = await mockHMailItem(outbound_context)
-        mock_hmail.mxlist = []
-        await new Promise((resolve, reject) => {
-            const orig = HMailItem.prototype.temp_fail
-            HMailItem.prototype.temp_fail = function (err, opts) {
-                try {
-                    assert.equal(this.todo.rcpt_to[0].dsn_status, '5.1.2', 'dsn status')
-                    resolve()
-                } catch (e) {
-                    reject(e)
-                } finally {
-                    HMailItem.prototype.temp_fail = orig
-                }
-            }
-            HMailItem.prototype.try_deliver.apply(mock_hmail, [])
-        })
-    })
+    }
 })