Skip to content

Commit 0d67c73

Browse files
hmacrhmacr
committed
remove affectedFiles from PR event
1 parent b37bf9c commit 0d67c73

4 files changed

Lines changed: 54 additions & 82 deletions

File tree

‎src/VCS/Adapter/Git/GitHub.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -989,14 +989,6 @@ public function getEvent(string $event, string $payload): array
989989
$baseLogin = $payloadPullRequestBaseUser['login'] ?? '';
990990
$external = $headLogin !== $baseLogin;
991991

992-
try {
993-
$prFiles = $this->getPullRequestFiles($owner, $repositoryName, (int)$pullRequestNumber);
994-
$affectedFiles = array_column($prFiles, 'filename');
995-
} catch (Exception $e) {
996-
// In case of any error while fetching pull request files, we will return an empty list of affected files.
997-
$affectedFiles = [];
998-
}
999-
1000992
return [
1001993
'branch' => $branch,
1002994
'branchUrl' => $branchUrl,
@@ -1012,7 +1004,6 @@ public function getEvent(string $event, string $payload): array
10121004
'external' => $external,
10131005
'pullRequestNumber' => $pullRequestNumber,
10141006
'action' => $action,
1015-
'affectedFiles' => $affectedFiles,
10161007
];
10171008
case 'installation':
10181009
case 'installation_repositories':

‎src/VCS/Adapter/Git/Gitea.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,13 +1037,6 @@ public function getEvent(string $event, string $payload): array
10371037
$baseRepoFullName = $payloadRepository['full_name'] ?? '';
10381038
$external = !empty($headRepoFullName) && !empty($baseRepoFullName) && $headRepoFullName !== $baseRepoFullName;
10391039

1040-
try {
1041-
$prFiles = $this->getPullRequestFiles($owner, $repositoryName, (int)$pullRequestNumber);
1042-
$affectedFiles = array_column($prFiles, 'filename');
1043-
} catch (Exception $e) {
1044-
$affectedFiles = [];
1045-
}
1046-
10471040
return [
10481041
'branch' => $branch,
10491042
'branchUrl' => $branchUrl,
@@ -1059,7 +1052,6 @@ public function getEvent(string $event, string $payload): array
10591052
'external' => $external,
10601053
'pullRequestNumber' => $pullRequestNumber,
10611054
'action' => $action,
1062-
'affectedFiles' => $affectedFiles,
10631055
];
10641056
}
10651057

‎tests/VCS/Adapter/GitHubTest.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testGetEventPullRequest(): void
109109
"pull_request": {
110110
"id": 1303283688,
111111
"state": "open",
112-
"html_url": "https://github.com/vermakhushboo/basic-js-crud/pull/1",
112+
"html_url": "https://github.com/vermakhushboo/g4-node-function/pull/17",
113113
"head": {
114114
"ref": "test",
115115
"sha": "a27dbe54b17032ee35a16c24bac151e5c2b33328",
@@ -131,11 +131,11 @@ public function testGetEventPullRequest(): void
131131
},
132132
"repository": {
133133
"id": 3498,
134-
"name": "basic-js-crud",
134+
"name": "functions-example",
135135
"owner": {
136136
"login": "vermakhushboo"
137137
},
138-
"html_url": "https://github.com/vermakhushboo/basic-js-crud"
138+
"html_url": "https://github.com/vermakhushboo/g4-node-function"
139139
},
140140
"installation": {
141141
"id": 9876
@@ -149,8 +149,6 @@ public function testGetEventPullRequest(): void
149149

150150
$this->assertSame('opened', $result['action']);
151151
$this->assertSame(1, $result['pullRequestNumber']);
152-
$this->assertCount(1, $result['affectedFiles']);
153-
$this->assertContains('README.md', $result['affectedFiles']);
154152
}
155153

156154
public function testGetEventInstallation(): void

‎tests/VCS/Adapter/GiteaTest.php‎

Lines changed: 51 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -923,44 +923,49 @@ public function testGetEventPush(): void
923923

924924
public function testGetEventPullRequest(): void
925925
{
926-
$repositoryName = 'test-get-event-pull-request-' . \uniqid();
927-
$this->vcsAdapter->createRepository(self::$owner, $repositoryName, false);
928-
929-
$this->vcsAdapter->createFile(self::$owner, $repositoryName, 'README.md', '# Test');
930-
$this->vcsAdapter->createBranch(self::$owner, $repositoryName, 'feature-branch', static::$defaultBranch);
931-
$this->vcsAdapter->createFile(self::$owner, $repositoryName, 'feature.txt', 'feature content', 'Add feature', 'feature-branch');
932-
933-
$pr = $this->vcsAdapter->createPullRequest(self::$owner, $repositoryName, 'Test PR', 'feature-branch', static::$defaultBranch);
934-
$prNumber = $pr['number'] ?? 0;
935-
$commitHash = $pr['head']['sha'] ?? 'abc123';
936-
937-
$fullName = self::$owner . '/' . $repositoryName;
938-
$giteaUrl = System::getEnv('TESTS_GITEA_URL', 'http://gitea:3000');
939-
940926
$payload = json_encode([
941927
'action' => 'opened',
942-
'number' => $prNumber,
928+
'number' => 42,
943929
'pull_request' => [
930+
'id' => 1,
931+
'number' => 42,
932+
'state' => 'open',
933+
'title' => 'Test PR',
944934
'head' => [
945935
'ref' => 'feature-branch',
946-
'sha' => $commitHash,
947-
'repo' => ['full_name' => $fullName],
948-
'user' => ['login' => self::$owner],
936+
'sha' => 'abc123',
937+
'repo' => [
938+
'full_name' => 'test-owner/test-repo',
939+
],
940+
'user' => [
941+
'login' => 'pr-author',
942+
],
949943
],
950944
'base' => [
951945
'ref' => static::$defaultBranch,
952-
'user' => ['login' => self::$owner],
946+
'sha' => 'def456',
947+
'user' => [
948+
'login' => 'base-owner',
949+
],
950+
],
951+
'user' => [
952+
'login' => 'pr-author',
953+
'avatar_url' => 'http://gitea:3000/avatars/pr-author',
953954
],
954-
'user' => ['login' => self::$owner, 'avatar_url' => "{$giteaUrl}/avatars/" . self::$owner],
955955
],
956956
'repository' => [
957957
'id' => 123,
958-
'name' => $repositoryName,
959-
'full_name' => $fullName,
960-
'html_url' => "{$giteaUrl}/" . self::$owner . "/{$repositoryName}",
961-
'owner' => ['login' => self::$owner],
958+
'name' => 'test-repo',
959+
'full_name' => 'test-owner/test-repo',
960+
'html_url' => 'http://gitea:3000/test-owner/test-repo',
961+
'owner' => [
962+
'login' => 'test-owner',
963+
],
964+
],
965+
'sender' => [
966+
'login' => 'sender-user',
967+
'html_url' => 'http://gitea:3000/sender-user',
962968
],
963-
'sender' => ['html_url' => "{$giteaUrl}/" . self::$owner],
964969
]);
965970

966971
if ($payload === false) {
@@ -977,56 +982,46 @@ public function testGetEventPullRequest(): void
977982
$this->assertArrayHasKey('external', $result);
978983

979984
$this->assertSame('feature-branch', $result['branch']);
980-
$this->assertSame($prNumber, $result['pullRequestNumber']);
985+
$this->assertSame(42, $result['pullRequestNumber']);
981986
$this->assertSame('opened', $result['action']);
982-
$this->assertSame($repositoryName, $result['repositoryName']);
983-
$this->assertSame(self::$owner, $result['owner']);
987+
$this->assertSame('abc123', $result['commitHash']);
988+
$this->assertSame('test-repo', $result['repositoryName']);
989+
$this->assertSame('test-owner', $result['owner']);
984990
$this->assertFalse($result['external']);
985-
$this->assertCount(1, $result['affectedFiles']);
986-
$this->assertContains('feature.txt', $result['affectedFiles']);
987-
988-
$this->vcsAdapter->deleteRepository(self::$owner, $repositoryName);
989991
}
990992

991993
public function testGetEventPullRequestExternal(): void
992994
{
993-
$repositoryName = 'test-get-event-pr-external-' . \uniqid();
994-
$this->vcsAdapter->createRepository(self::$owner, $repositoryName, false);
995-
996-
$this->vcsAdapter->createFile(self::$owner, $repositoryName, 'README.md', '# Test');
997-
$this->vcsAdapter->createBranch(self::$owner, $repositoryName, 'feature-branch', static::$defaultBranch);
998-
$this->vcsAdapter->createFile(self::$owner, $repositoryName, 'feature.txt', 'feature content', 'Add feature', 'feature-branch');
999-
1000-
$pr = $this->vcsAdapter->createPullRequest(self::$owner, $repositoryName, 'External PR', 'feature-branch', static::$defaultBranch);
1001-
$prNumber = $pr['number'] ?? 0;
1002-
$commitHash = $pr['head']['sha'] ?? 'abc123';
1003-
1004-
$giteaUrl = System::getEnv('TESTS_GITEA_URL', 'http://gitea:3000');
1005-
1006995
$payload = json_encode([
1007996
'action' => 'opened',
1008-
'number' => $prNumber,
997+
'number' => 42,
1009998
'pull_request' => [
1010999
'head' => [
10111000
'ref' => 'feature-branch',
1012-
'sha' => $commitHash,
1013-
'repo' => ['full_name' => 'external-user/' . $repositoryName],
1014-
'user' => ['login' => 'external-user'],
1001+
'sha' => 'abc123',
1002+
'repo' => [
1003+
'full_name' => 'external-user/forked-repo',
1004+
],
10151005
],
10161006
'base' => [
10171007
'ref' => static::$defaultBranch,
1018-
'user' => ['login' => self::$owner],
10191008
],
1020-
'user' => ['avatar_url' => "{$giteaUrl}/avatars/external-user"],
1009+
'user' => [
1010+
'avatar_url' => 'http://gitea:3000/avatars/external',
1011+
],
10211012
],
10221013
'repository' => [
10231014
'id' => 123,
1024-
'name' => $repositoryName,
1025-
'full_name' => self::$owner . '/' . $repositoryName,
1026-
'html_url' => "{$giteaUrl}/" . self::$owner . "/{$repositoryName}",
1027-
'owner' => ['login' => self::$owner],
1015+
'name' => 'test-repo',
1016+
'full_name' => 'test-owner/test-repo',
1017+
'html_url' => 'http://gitea:3000/test-owner/test-repo',
1018+
'owner' => [
1019+
'login' => 'test-owner',
1020+
],
1021+
],
1022+
'sender' => [
1023+
'html_url' => 'http://gitea:3000/external-user',
10281024
],
1029-
'sender' => ['html_url' => "{$giteaUrl}/external-user"],
10301025
]);
10311026

10321027
if ($payload === false) {
@@ -1036,10 +1031,6 @@ public function testGetEventPullRequestExternal(): void
10361031
$result = $this->vcsAdapter->getEvent('pull_request', $payload);
10371032

10381033
$this->assertTrue($result['external']);
1039-
$this->assertCount(1, $result['affectedFiles']);
1040-
$this->assertContains('feature.txt', $result['affectedFiles']);
1041-
1042-
$this->vcsAdapter->deleteRepository(self::$owner, $repositoryName);
10431034
}
10441035

10451036
public function testValidateWebhookEvent(): void

0 commit comments

Comments
 (0)