Merge pull request #1 from ExpediaGroup/update

update test cases

.github/CODEOWNERS

@@ -7,3 +7,4 @@
 /file/path/1         @ExpediaGroup/test-owners-1
 /file/path/2         @ExpediaGroup/test-owners-2
 /file/path/shared    @ExpediaGroup/test-shared-owners-1 @ExpediaGroup/test-shared-owners-2
+/file/path/users     @user1 @user2

src/helpers/approvals-satisfied.ts

@@ -71,7 +71,7 @@ export const approvalsSatisfied = async ({
       if (isTeam(teamOrUsers)) {
         return await fetchTeamLogins(teamOrUsers);
       } else {
-        return teamOrUsers.split(',');
+        return teamOrUsers.replaceAll('@', '').split(',');
       }
     });
     const codeOwnerLogins = uniq(loginsLists.flat());

src/helpers/remove-pr-from-merge-queue.ts

@@ -12,6 +12,7 @@ limitations under the License.
 */
 
 import * as core from '@actions/core';
+import { orderBy } from 'lodash';
 import { FIRST_QUEUED_PR_LABEL, QUEUED_FOR_MERGE_PREFIX, READY_FOR_MERGE_PR_LABEL } from '../constants';
 import { HelperInputs } from '../types/generated';
 import { context } from '@actions/github';
@@ -54,8 +55,8 @@ export const removePrFromMergeQueue = async ({ seconds }: RemovePrFromMergeQueue
     ref: sha,
     ...context.repo
   });
-  const status = data.find(status => status.state === 'failure' || status.state === 'success');
-  if (status && timestampIsStale(status.created_at, seconds)) {
+  const mostRecentStatus = orderBy(data, 'created_at', 'desc')[0];
+  if (mostRecentStatus && timestampIsStale(mostRecentStatus.created_at, seconds)) {
     core.info('Removing stale PR from first queued position...');
     return Promise.all([removeLabelIfExists(READY_FOR_MERGE_PR_LABEL, number), removeLabelIfExists(FIRST_QUEUED_PR_LABEL, number)]);
   }

test/helpers/approvals-satisfied.test.ts

@@ -525,7 +525,7 @@ describe('approvalsSatisfied', () => {
       ]
     });
     const result = await approvalsSatisfied({
-      users: 'user1,user2',
+      users: '@user1,@user2',
       pull_number: '12345'
     });
     expect(octokit.pulls.listReviews).toHaveBeenCalledWith({ pull_number: 12345, repo: 'repo', owner: 'owner', page: 1, per_page: 100 });
@@ -543,11 +543,35 @@ describe('approvalsSatisfied', () => {
       ]
     });
     const result = await approvalsSatisfied({
-      users: 'user1,user2',
+      users: '@user1,@user2',
       pull_number: '12345'
     });
     expect(octokit.pulls.listReviews).toHaveBeenCalledWith({ pull_number: 12345, repo: 'repo', owner: 'owner', page: 1, per_page: 100 });
     expect(getRequiredCodeOwnersEntries).not.toHaveBeenCalled();
     expect(result).toBe(false);
   });
+
+  it('should return true when approvals are satisfied and users are explicitly defined in CODEOWNERS', async () => {
+    (getRequiredCodeOwnersEntries as jest.Mock).mockResolvedValue([{ owners: ['@user1', '@user2'] }]);
+    mockPagination({
+      data: [
+        {
+          state: 'APPROVED',
+          user: { login: 'user1' }
+        },
+        {
+          state: 'APPROVED',
+          user: { login: 'user2' }
+        },
+        {
+          state: 'APPROVED',
+          user: { login: 'user3' }
+        }
+      ]
+    });
+    const result = await approvalsSatisfied({
+      number_of_reviewers: '2'
+    });
+    expect(result).toBe(true);
+  });
 });

test/helpers/remove-pr-from-merge-queue.test.ts

@@ -57,16 +57,12 @@ describe('removePrFromMergeQueue', () => {
     beforeEach(() => {
       (octokit.repos.listCommitStatusesForRef as unknown as Mocktokit).mockImplementation(async () => ({
         data: [
-          {
-            created_at: '2022-01-01T10:00:00Z',
-            state: 'success'
-          },
           {
             created_at: '2022-01-01T08:59:00Z',
             state: 'failure'
           },
           {
-            created_at: '2022-01-01T10:00:00Z',
+            created_at: '2022-01-01T08:00:00Z',
             state: 'success'
           }
         ]
@@ -99,10 +95,6 @@ describe('removePrFromMergeQueue', () => {
     beforeEach(() => {
       (octokit.repos.listCommitStatusesForRef as unknown as Mocktokit).mockImplementation(async () => ({
         data: [
-          {
-            created_at: '2022-01-01T10:00:00Z',
-            state: 'success'
-          },
           {
             created_at: '2022-01-01T09:01:00Z',
             state: 'failure'
@@ -136,47 +128,6 @@ describe('removePrFromMergeQueue', () => {
     });
   });
 
-  describe('should not remove pr case with no failure status', () => {
-    beforeEach(async () => {
-      (octokit.repos.listCommitStatusesForRef as unknown as Mocktokit).mockImplementation(async () => ({
-        data: [
-          {
-            created_at: '2022-01-01T10:00:00Z',
-            state: 'success'
-          },
-          {
-            created_at: '2022-01-01T09:01:00Z',
-            state: 'pending'
-          },
-          {
-            created_at: '2022-01-01T10:00:00Z',
-            state: 'success'
-          }
-        ]
-      }));
-      await removePrFromMergeQueue({ seconds });
-    });
-
-    it('should call pulls.list with correct params', () => {
-      expect(octokit.pulls.list).toHaveBeenCalledWith({
-        state: 'open',
-        per_page: 100,
-        ...context.repo
-      });
-    });
-
-    it('should call listCommitStatusesForRef with correct params', () => {
-      expect(octokit.repos.listCommitStatusesForRef).toHaveBeenCalledWith({
-        ref: 'correct sha',
-        ...context.repo
-      });
-    });
-
-    it('should not call removeLabelIfExists', () => {
-      expect(removeLabelIfExists).not.toHaveBeenCalled();
-    });
-  });
-
   describe('should remove stray PRs in the queue', () => {
     beforeEach(async () => {
       (octokit.pulls.list as unknown as Mocktokit).mockImplementation(async () => ({

test/utils/get-core-member-logins.test.ts

@@ -109,6 +109,9 @@ describe('getCoreMemberLogins', () => {
                   },
                   {
                     filename: sharedFile
+                  },
+                  {
+                    filename: 'file/path/users/file.ts'
                   }
                 ]
               : []
@@ -126,6 +129,10 @@ describe('getCoreMemberLogins', () => {
           {
             pattern: '/file/path/shared',
             owners: ['@ExpediaGroup/test-shared-owners-1', '@ExpediaGroup/test-shared-owners-2']
+          },
+          {
+            pattern: '/file/path/users',
+            owners: ['@user1', '@user2']
           }
         ]);
       });