From e834ab0c03d485d30687bede0cf85763691f314d Mon Sep 17 00:00:00 2001 From: azu Date: Mon, 8 Nov 2021 21:17:03 +0900 Subject: [PATCH] fix: fix handling of redirects --- src/no-dead-link.js | 9 ++++----- test/no-dead-link.js | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/no-dead-link.js b/src/no-dead-link.js index d12b7e9..b4e01b3 100644 --- a/src/no-dead-link.js +++ b/src/no-dead-link.js @@ -295,17 +295,16 @@ function reporter(context, options = {}) { : await memorizedIsAliveURI(uri, method, maxRetryCount); const { ok, redirected, redirectTo, message } = result; - if (!ok) { - const lintMessage = `${uri} is dead. (${message})`; - report(node, new RuleError(lintMessage, { index })); - } else if (redirected && !ruleOptions.ignoreRedirects) { + if (redirected && !ruleOptions.ignoreRedirects) { const lintMessage = `${uri} is redirected to ${redirectTo}. (${message})`; const fix = fixer.replaceTextRange( [index, index + uri.length], redirectTo, ); - report(node, new RuleError(lintMessage, { fix, index })); + } else if (!ok) { + const lintMessage = `${uri} is dead. (${message})`; + report(node, new RuleError(lintMessage, { index })); } }; diff --git a/test/no-dead-link.js b/test/no-dead-link.js index 2d5ecc6..292bbf3 100644 --- a/test/no-dead-link.js +++ b/test/no-dead-link.js @@ -17,7 +17,7 @@ tester.run('no-dead-link', rule, { 'should success with retrying on error: [npm results for textlint](https://www.npmjs.com/search?q=textlint)', 'should treat 200 OK as alive: https://httpstat.us/200', 'should treat 200 OK. It require User-Agent: Navigate to [MySQL distribution](https://dev.mysql.com/downloads/mysql/) to install MySQL `5.7`.', - 'should treat 200 OK. It require User-Agent: https://tools.ietf.org/html/rfc6749', + 'should treat 200 OK. It require User-Agent: https://datatracker.ietf.org/doc/html/rfc6749', { text: 'should be able to check a URL in a plain text: https://example.com/',