fix: use mocking pull request fn also for issues

src/practices/LanguageIndependent/TimeToSolvePullRequestsPractice.spec.ts

@@ -1,12 +1,13 @@
 import moment from 'moment';
 import nock from 'nock';
-import { CollaborationInspector } from '../../inspectors';
+import { CollaborationInspector, Paginated } from '../../inspectors';
 import { createTestContainer, TestContainerContext } from '../../inversify.config';
 import { PracticeEvaluationResult } from '../../model';
 import { BitbucketPullRequestState, BitbucketService } from '../../services';
 import { BitbucketNock } from '../../test/helpers/bitbucketNock';
 import { TimeToSolvePullRequestsPractice } from './TimeToSolvePullRequestsPractice';
 import { Types } from '../../types';
+import { PullRequest } from '../../services/git/model';
 
 describe('TimeToSolvePullRequestsPractice', () => {
   let practice: TimeToSolvePullRequestsPractice;
@@ -22,9 +23,9 @@ describe('TimeToSolvePullRequestsPractice', () => {
 
   beforeAll(() => {
     containerCtx = createTestContainer();
-    containerCtx.container.bind('TimeToSolvePullRequestsPractice').to(TimeToSolvePullRequestsPractice);
+    containerCtx.container.bind('TimeToSolvePractice').to(TimeToSolvePullRequestsPractice);
     containerCtx.container.rebind(Types.IContentRepositoryBrowser).to(BitbucketService);
-    practice = containerCtx.container.get('TimeToSolvePullRequestsPractice');
+    practice = containerCtx.container.get('TimeToSolvePractice');
     mockCollaborationInspector = new MockedCollaborationInspector();
   });
 
@@ -38,7 +39,7 @@ describe('TimeToSolvePullRequestsPractice', () => {
     bitbucketNock.getApiResponse({ resource: 'pullrequests', state: BitbucketPullRequestState.open });
     const args = { states: BitbucketPullRequestState.open, updatedAt: Date.now() - moment.duration(10, 'days').asMilliseconds() };
     mockCollaborationInspector.getPullRequests = async () => {
-      return bitbucketNock.mockBitbucketPullRequestsResponse(args);
+      return <Paginated<PullRequest>>bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse(args);
     };
 
     const evaluated = await practice.evaluate({
@@ -54,7 +55,7 @@ describe('TimeToSolvePullRequestsPractice', () => {
     bitbucketNock.getApiResponse({ resource: 'pullrequests', state: BitbucketPullRequestState.open });
     const args = { states: BitbucketPullRequestState.open, updatedAt: Date.now() - moment.duration(100, 'days').asMilliseconds() };
     mockCollaborationInspector.getPullRequests = async () => {
-      return bitbucketNock.mockBitbucketPullRequestsResponse(args);
+      return <Paginated<PullRequest>>bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse(args);
     };
 
     const evaluated = await practice.evaluate({

src/services/bitbucket/BitbucketService.spec.ts

@@ -29,7 +29,7 @@ describe('Bitbucket Service', () => {
     bitbucketNock.getApiResponse({ resource: 'pullrequests' });
 
     const response = await service.getPullRequests('pypy', 'pypy');
-    const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketPullRequestsResponse({ states: BitbucketPullRequestState.open });
+    const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse({ states: BitbucketPullRequestState.open });
     expect(response).toMatchObject(getOpenPullRequestsResponse);
   });
 
@@ -38,7 +38,7 @@ describe('Bitbucket Service', () => {
     bitbucketNock.getApiResponse({ resource: 'pullrequests', state: BitbucketPullRequestState.open, pagination: { page: 1, perPage: 1 } });
 
     const response = await service.getPullRequests('pypy', 'pypy', { pagination: { page: 1, perPage: 1 } });
-    const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketPullRequestsResponse({ states: BitbucketPullRequestState.open });
+    const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse({ states: BitbucketPullRequestState.open });
     expect(response).toMatchObject(getOpenPullRequestsResponse);
   });
 
@@ -48,7 +48,7 @@ describe('Bitbucket Service', () => {
     bitbucketNock.getAdditionsAndDeletions('1');
 
     const response = await service.getPullRequests('pypy', 'pypy', { withDiffStat: true });
-    const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketPullRequestsResponse({
+    const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse({
       states: BitbucketPullRequestState.open,
       withDiffStat: true,
     });
@@ -62,7 +62,7 @@ describe('Bitbucket Service', () => {
     bitbucketNock.getApiResponse({ resource: 'pullrequests', state: state });
 
     const response = await service.getPullRequests('pypy', 'pypy', { filter: { state: PullRequestState.all } });
-    const allPullrequestsResponse = bitbucketNock.mockBitbucketPullRequestsResponse({ states: state });
+    const allPullrequestsResponse = bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse({ states: state });
 
     expect(response).toMatchObject(allPullrequestsResponse);
   });
@@ -114,7 +114,7 @@ describe('Bitbucket Service', () => {
     bitbucketNock.getApiResponse({ resource: 'pullrequests', state: BitbucketPullRequestState.closed });
 
     const response = await service.getPullRequests('pypy', 'pypy', state);
-    const getMergedPullRequestsResponse = bitbucketNock.mockBitbucketPullRequestsResponse({ states: BitbucketPullRequestState.closed });
+    const getMergedPullRequestsResponse = bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse({ states: BitbucketPullRequestState.closed });
 
     expect(response).toMatchObject(getMergedPullRequestsResponse);
   });

src/test/helpers/bitbucketNock.ts

@@ -4,7 +4,7 @@ import { BitbucketCommit } from '../../services/bitbucket/BitbucketService';
 import { BitbucketPullRequestState } from '../../services/git/IVCSService';
 import qs from 'qs';
 import { Paginated, PaginationParams } from '../../inspectors';
-import { PullRequest } from '../../services/git/model';
+import { PullRequest, Issue } from '../../services/git/model';
 import { getPullRequestResponse } from '../../services/git/__MOCKS__/bitbucketServiceMockFolder';
 import _ from 'lodash';
 import moment from 'moment';
@@ -142,11 +142,11 @@ export class BitbucketNock {
     return interceptor;
   }
 
-  mockBitbucketPullRequestsResponse(args: {
+  mockBitbucketIssuesOrPullRequestsResponse(args: {
     states?: BitbucketPullRequestState | BitbucketPullRequestState[];
     updatedAt?: number;
     withDiffStat?: boolean;
-  }): Paginated<PullRequest> {
+  }): Paginated<PullRequest | Issue> {
     const pullRequests: PullRequest[] = [];
     if (!args.states) {
       return {