From f977b7913ec651c219d9092d7286adc20b320d02 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Thu, 18 Oct 2018 12:49:55 -0300 Subject: [PATCH 1/2] lify up config checks into main path --- index.js | 4 ++-- lib/IssueBodyChecker.js | 5 +---- lib/PullRequestBodyChecker.js | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 13a8426..381bd0e 100644 --- a/index.js +++ b/index.js @@ -36,11 +36,11 @@ module.exports = app => { } if (eventSrc === 'pullRequest') { - if (!(await PullRequestBodyChecker.isBodyValid(body, config, context))) { + if (config.checkPullRequestTemplate && !(await PullRequestBodyChecker.isBodyValid(body, config, context))) { badBody = true } } else if (eventSrc === 'issue') { - if (!(await IssueBodyChecker.isBodyValid(body, config, context))) { + if (config.checkIssueTemplate && !(await IssueBodyChecker.isBodyValid(body, config, context))) { badBody = true } } diff --git a/lib/IssueBodyChecker.js b/lib/IssueBodyChecker.js index 6cd154c..1f06a1e 100644 --- a/lib/IssueBodyChecker.js +++ b/lib/IssueBodyChecker.js @@ -68,10 +68,7 @@ class IssueBodyChecker { return false } - if ( - config.checkIssueTemplate && - (await isBodyEqualToTemplate(body, context)) - ) { + if (await isBodyEqualToTemplate(body, context)) { return false } diff --git a/lib/PullRequestBodyChecker.js b/lib/PullRequestBodyChecker.js index be2d2bc..a63512d 100644 --- a/lib/PullRequestBodyChecker.js +++ b/lib/PullRequestBodyChecker.js @@ -19,7 +19,7 @@ class PullRequestBodyChecker { return false } - if (config.checkPullRequestTemplate && await isBodyEqualToTemplate(body, context)) { + if (await isBodyEqualToTemplate(body, context)) { return false } From 6958f74ec5e03a775272a9e66da9953ea1af36d4 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Thu, 18 Oct 2018 12:53:44 -0300 Subject: [PATCH 2/2] remove unnecessary parameter --- index.js | 4 ++-- lib/IssueBodyChecker.js | 2 +- lib/PullRequestBodyChecker.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 381bd0e..d6ec073 100644 --- a/index.js +++ b/index.js @@ -36,11 +36,11 @@ module.exports = app => { } if (eventSrc === 'pullRequest') { - if (config.checkPullRequestTemplate && !(await PullRequestBodyChecker.isBodyValid(body, config, context))) { + if (config.checkPullRequestTemplate && !(await PullRequestBodyChecker.isBodyValid(body, context))) { badBody = true } } else if (eventSrc === 'issue') { - if (config.checkIssueTemplate && !(await IssueBodyChecker.isBodyValid(body, config, context))) { + if (config.checkIssueTemplate && !(await IssueBodyChecker.isBodyValid(body, context))) { badBody = true } } diff --git a/lib/IssueBodyChecker.js b/lib/IssueBodyChecker.js index 1f06a1e..e9a975d 100644 --- a/lib/IssueBodyChecker.js +++ b/lib/IssueBodyChecker.js @@ -63,7 +63,7 @@ async function isBodyEqualToTemplate (body, context) { } class IssueBodyChecker { - static async isBodyValid (body, config, context) { + static async isBodyValid (body, context) { if (!body) { return false } diff --git a/lib/PullRequestBodyChecker.js b/lib/PullRequestBodyChecker.js index a63512d..bbd3b24 100644 --- a/lib/PullRequestBodyChecker.js +++ b/lib/PullRequestBodyChecker.js @@ -14,7 +14,7 @@ async function isBodyEqualToTemplate (body, context) { } class PullRequestBodyChecker { - static async isBodyValid (body, config, context) { + static async isBodyValid (body, context) { if (!body) { return false }