Enable MergeConflictChecker plugin for esphome/esphome (#231)

home-assistant · Dec 21, 2023 · 88021b6 · 88021b6
1 parent 0e56419
commit 88021b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/services/bots/src/github-webhook/github-webhook.const.ts b/services/bots/src/github-webhook/github-webhook.const.ts
@@ -18,13 +18,17 @@ export type GetIssueLabelResponse =
 export type PullRequestCreateReviewParams =
   RestEndpointMethodTypes['pulls']['createReview']['parameters'];
 
-export type Repository = HomeAssistantRepository;
+export type Repository = HomeAssistantRepository | ESPHomeRepository;
 
 export enum Organization {
   ESPHOME = 'esphome',
   HOME_ASSISTANT = 'home-assistant',
 }
 
+export enum ESPHomeRepository {
+  ESPHOME = 'esphome/esphome',
+}
+
 export enum HomeAssistantRepository {
   ADDONS = 'home-assistant/addons',
   ANDROID = 'home-assistant/android',

diff --git a/services/bots/src/github-webhook/handlers/merge_conflict.ts b/services/bots/src/github-webhook/handlers/merge_conflict.ts
@@ -1,11 +1,11 @@
 import { PullRequestOpenedEvent, PullRequestSynchronizeEvent } from '@octokit/webhooks-types';
-import { EventType, HomeAssistantRepository } from '../github-webhook.const';
+import { ESPHomeRepository, EventType, HomeAssistantRepository } from '../github-webhook.const';
 import { WebhookContext } from '../github-webhook.model';
 import { BaseWebhookHandler } from './base';
 
 export class MergeConflictChecker extends BaseWebhookHandler {
   public allowedEventTypes = [EventType.PULL_REQUEST_OPENED, EventType.PULL_REQUEST_SYNCHRONIZE];
-  public allowedRepositories = [HomeAssistantRepository.CORE];
+  public allowedRepositories = [HomeAssistantRepository.CORE, ESPHomeRepository.ESPHOME];
 
   async handle(context: WebhookContext<PullRequestOpenedEvent | PullRequestSynchronizeEvent>) {
     // The data in the event is stale, so we need to re-fetch it.

diff --git a/tests/services/bots/github-webhook/verify_enabled_handlers.spec.ts b/tests/services/bots/github-webhook/verify_enabled_handlers.spec.ts
@@ -124,7 +124,7 @@ describe('GithubWebhookModule', () => {
     },
     {
       eventType: EventType.PULL_REQUEST_OPENED,
-      handlers: [],
+      handlers: ['MergeConflictChecker'],
       payload: {
         repository: { full_name: 'esphome/esphome', owner: { login: 'esphome' } },
       },
@@ -173,7 +173,7 @@ describe('GithubWebhookModule', () => {
     },
     {
       eventType: EventType.PULL_REQUEST_SYNCHRONIZE,
-      handlers: [],
+      handlers: ['MergeConflictChecker'],
       payload: {
         repository: { full_name: 'esphome/esphome', owner: { login: 'esphome' } },
       },