Skip to content

Commit

Permalink
fix(azure): Fix "branchName" field for azure-helper.ts (#7211)
Browse files Browse the repository at this point in the history 
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
  • Loading branch information
@zharinov @viceice
zharinov and viceice committed Sep 8, 2020
1 parent c0026ff commit cb24014
Show file tree
Hide file tree
Showing 9 changed files with 281 additions and 284 deletions.
53 changes: 0 additions & 53 deletions lib/platform/azure/__snapshots__/azure-helper.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,59 +54,6 @@ Array [
]
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (closed v2) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"number": undefined,
"state": "merged",
"status": 3,
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (closed) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"number": undefined,
"state": "closed",
"status": 2,
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (isConflicted) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"isConflicted": true,
"mergeStatus": 2,
"number": undefined,
"state": "open",
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (not closed) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"number": undefined,
"state": "open",
"status": 1,
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getStorageExtraCloneOpts should configure basic auth 1`] = `
Object {
"-c": "http.extraheader=AUTHORIZATION: basic dXNlcjpwYXNz",
Expand Down
61 changes: 60 additions & 1 deletion lib/platform/azure/__snapshots__/index.spec.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,29 @@

exports[`platform/azure createPr() should create and return a PR object 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #456",
"number": 456,
"pullRequestId": 456,
"sourceRefName": undefined,
"state": "open",
"targetBranch": undefined,
}
`;

exports[`platform/azure createPr() should create and return a PR object from base branch 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #456",
"number": 456,
"pullRequestId": 456,
"sourceRefName": undefined,
"state": "open",
"targetBranch": undefined,
}
`;

Expand All @@ -21,15 +33,22 @@ Object {
"autoCompleteSetBy": Object {
"id": 123,
},
"body": undefined,
"branchName": undefined,
"completionOptions": Object {
"deleteSourceBranch": true,
"squashMerge": true,
},
"createdAt": undefined,
"createdBy": Object {
"id": 123,
},
"displayNumber": "Pull Request #456",
"number": 456,
"pullRequestId": 456,
"sourceRefName": undefined,
"state": "open",
"targetBranch": undefined,
}
`;

Expand Down Expand Up @@ -94,36 +113,68 @@ content",

exports[`platform/azure findPr(branchName, prTitle, state) returns pr if found it all state 1`] = `
Object {
"body": undefined,
"branchName": "branch-a",
"createdAt": undefined,
"displayNumber": "Pull Request #1",
"number": 1,
"pullRequestId": 1,
"sourceRefName": "refs/heads/branch-a",
"state": "closed",
"status": 2,
"targetBranch": "branch-b",
"targetRefName": "refs/heads/branch-b",
"title": "branch a pr",
}
`;

exports[`platform/azure findPr(branchName, prTitle, state) returns pr if found it close 1`] = `
Object {
"body": undefined,
"branchName": "branch-a",
"createdAt": undefined,
"displayNumber": "Pull Request #1",
"number": 1,
"pullRequestId": 1,
"sourceRefName": "refs/heads/branch-a",
"state": "closed",
"status": 2,
"targetBranch": "branch-b",
"targetRefName": "refs/heads/branch-b",
"title": "branch a pr",
}
`;

exports[`platform/azure findPr(branchName, prTitle, state) returns pr if found it open 1`] = `
Object {
"body": undefined,
"branchName": "branch-a",
"createdAt": undefined,
"displayNumber": "Pull Request #1",
"number": 1,
"pullRequestId": 1,
"sourceRefName": "refs/heads/branch-a",
"state": "open",
"status": 1,
"targetBranch": "branch-b",
"targetRefName": "refs/heads/branch-b",
"title": "branch a pr",
}
`;

exports[`platform/azure findPr(branchName, prTitle, state) returns pr if found not open 1`] = `
Object {
"body": undefined,
"branchName": "branch-a",
"createdAt": undefined,
"displayNumber": "Pull Request #1",
"number": 1,
"pullRequestId": 1,
"sourceRefName": "refs/heads/branch-a",
"state": "closed",
"state": "merged",
"status": 3,
"targetBranch": "branch-b",
"targetRefName": "refs/heads/branch-b",
"title": "branch a pr",
}
`;
Expand All @@ -132,11 +183,19 @@ exports[`platform/azure getBranchPr(branchName) should return the pr 1`] = `null

exports[`platform/azure getPr(prNo) should return a pr in the right format 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #1234",
"hasReviewers": false,
"labels": Array [
"renovate",
],
"number": 1234,
"pullRequestId": 1234,
"sourceRefName": undefined,
"state": "open",
"targetBranch": undefined,
}
`;

Expand Down
58 changes: 58 additions & 0 deletions lib/platform/azure/__snapshots__/util.spec.ts.snap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`platform/azure/helpers getRenovatePRFormat should be formated (closed v2) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"number": undefined,
"sourceRefName": undefined,
"state": "merged",
"status": 3,
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (closed) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"number": undefined,
"sourceRefName": undefined,
"state": "closed",
"status": 2,
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (isConflicted) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"isConflicted": true,
"mergeStatus": 2,
"number": undefined,
"sourceRefName": undefined,
"state": "open",
"targetBranch": undefined,
}
`;

exports[`platform/azure/helpers getRenovatePRFormat should be formated (not closed) 1`] = `
Object {
"body": undefined,
"branchName": undefined,
"createdAt": undefined,
"displayNumber": "Pull Request #undefined",
"number": undefined,
"sourceRefName": undefined,
"state": "open",
"status": 1,
"targetBranch": undefined,
}
`;
52 changes: 0 additions & 52 deletions lib/platform/azure/azure-helper.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,6 @@ describe('platform/azure/helpers', () => {
});
});

describe('getNewBranchName', () => {
it('should add refs/heads', () => {
const res = azureHelper.getNewBranchName('testBB');
expect(res).toBe(`refs/heads/testBB`);
});
it('should be the same', () => {
const res = azureHelper.getNewBranchName('refs/heads/testBB');
expect(res).toBe(`refs/heads/testBB`);
});
});

describe('getBranchNameWithoutRefsheadsPrefix', () => {
it('should be renamed', () => {
const res = azureHelper.getBranchNameWithoutRefsheadsPrefix(
'refs/heads/testBB'
);
expect(res).toBe(`testBB`);
});
it('should log error and return undefined', () => {
const res = azureHelper.getBranchNameWithoutRefsheadsPrefix(
undefined as any
);
expect(res).toBeUndefined();
});
it('should return the input', () => {
const res = azureHelper.getBranchNameWithoutRefsheadsPrefix('testBB');
expect(res).toBe('testBB');
});
});

describe('getRef', () => {
it('should get the ref with short ref name', async () => {
azureApi.gitApi.mockImplementationOnce(
Expand Down Expand Up @@ -248,28 +218,6 @@ describe('platform/azure/helpers', () => {
});
});

describe('getRenovatePRFormat', () => {
it('should be formated (closed)', () => {
const res = azureHelper.getRenovatePRFormat({ status: 2 } as any);
expect(res).toMatchSnapshot();
});

it('should be formated (closed v2)', () => {
const res = azureHelper.getRenovatePRFormat({ status: 3 } as any);
expect(res).toMatchSnapshot();
});

it('should be formated (not closed)', () => {
const res = azureHelper.getRenovatePRFormat({ status: 1 } as any);
expect(res).toMatchSnapshot();
});

it('should be formated (isConflicted)', () => {
const res = azureHelper.getRenovatePRFormat({ mergeStatus: 2 } as any);
expect(res).toMatchSnapshot();
});
});

describe('getCommitDetails', () => {
it('should get commit details', async () => {
azureApi.gitApi.mockImplementationOnce(
Expand Down

0 comments on commit cb24014

Please sign in to comment.