vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2665 from alecmerdler/fix-trigger-build-source

Browse source 
Fixed Build Source in Custom Git Trigger
This commit is contained in:
Alec Merdler 2017-05-24 15:18:47 -07:00 committed by GitHub
commit c61e212ecd
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
static/js/directives/ui/manage-trigger/manage-trigger.component.spec.ts
View file

@ -47,6 +47,23 @@ describe("ManageTriggerComponent", () => {
});
});
describe("checkBuildSource", () => {
it("sets selected repository full name if given build source matches regex pattern", () => {
const buildSource: string = "git@somegithost.net:user/repo.git";
component.checkBuildSource(buildSource);
expect(component.local.selectedRepository.full_name).toEqual(buildSource);
});
it("sets selected repository full name to null if given build source does not match regex pattern", () => {
const buildSource: string = "a_randomstring";
component.checkBuildSource(buildSource);
expect(component.local.selectedRepository.full_name).toBe(null);
});
});
describe("getTriggerIcon", () => {
beforeEach(() => {

3
static/js/directives/ui/manage-trigger/manage-trigger.component.ts
View file

@ -70,8 +70,9 @@ export class ManageTriggerComponent implements OnInit {
}
public checkBuildSource(buildSource: string): void {
const buildSourceRegExp = new RegExp(/(((http|https):\/\/)(.+)|\w+@(.+):(.+))/, 'i');
try {
this.local.selectedRepository.full_name = buildSource.split(':')[1].replace('.git', '');
this.local.selectedRepository.full_name = buildSourceRegExp.test(buildSource) ? buildSource : null;
} catch (error) {
this.local.selectedRepository.full_name = null;
}