refactoring to promises
This commit is contained in:
parent
390e389027
commit
85441c8459
9 changed files with 191 additions and 28 deletions
|
@ -170,7 +170,77 @@ describe("DockerfileServiceImpl", () => {
|
|||
});
|
||||
|
||||
describe("extractDockerfile", () => {
|
||||
// TODO: TDD promise-based method with same functionality as getDockerfile
|
||||
var file: any;
|
||||
var invalidArchiveFile: any[];
|
||||
var validArchiveFile: any[];
|
||||
var readAsFileBufferSpy: Spy;
|
||||
var forDataSpy: Spy;
|
||||
|
||||
beforeEach(() => {
|
||||
dataFileServiceMock.readDataArrayAsPossibleArchive.and.callFake((buf, success, failure) => {
|
||||
failure([]);
|
||||
});
|
||||
|
||||
dataFileServiceMock.arrayToString.and.callFake((buf, callback) => {
|
||||
var contents: string = "";
|
||||
callback(contents);
|
||||
});
|
||||
|
||||
dataFileServiceMock.blobToString.and.callFake((blob, callback) => {
|
||||
callback(blob.toString());
|
||||
});
|
||||
|
||||
forDataSpy = spyOn(DockerfileInfoImpl, "forData").and.returnValue(new DockerfileInfoImpl(file, configMock));
|
||||
readAsFileBufferSpy = spyOn(fileReaderMock, "readAsArrayBuffer").and.callFake(() => {
|
||||
var event: any = {target: {result: file}};
|
||||
fileReaderMock.onload(event);
|
||||
});
|
||||
|
||||
file = "FROM quay.io/coreos/nginx:latest";
|
||||
validArchiveFile = [{name: 'Dockerfile', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue(file)}];
|
||||
invalidArchiveFile = [{name: 'main.exe', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue("")}];
|
||||
});
|
||||
|
||||
it("calls datafile service to read given file as possible archive file", (done) => {
|
||||
dockerfileServiceImpl.extractDockerfile(file)
|
||||
.then((dockerfile: DockerfileInfoImpl) => {
|
||||
expect(readAsFileBufferSpy.calls.argsFor(0)[0]).toEqual(file);
|
||||
expect(dataFileServiceMock.readDataArrayAsPossibleArchive).toHaveBeenCalled();
|
||||
done();
|
||||
})
|
||||
.catch((error: string) => {
|
||||
fail('Promise should be resolved');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it("calls datafile service to convert file to string if given file is not an archive", (done) => {
|
||||
done();
|
||||
});
|
||||
|
||||
it("returns rejected promise if given non-archive file that is not a valid Dockerfile", (done) => {
|
||||
done();
|
||||
});
|
||||
|
||||
it("returns resolved promise with new DockerfileInfoImpl instance if given valid Dockerfile", (done) => {
|
||||
done();
|
||||
});
|
||||
|
||||
it("returns rejected promise if given archive file with no Dockerfile present in root directory", (done) => {
|
||||
done();
|
||||
});
|
||||
|
||||
it("calls datafile service to convert blob to string if given file is an archive", (done) => {
|
||||
done();
|
||||
});
|
||||
|
||||
it("returns rejected promise if given archive file with invalid Dockerfile", (done) => {
|
||||
done();
|
||||
});
|
||||
|
||||
it("returns resolved promise of new DockerfileInfoImpl instance if given archive with valid Dockerfile", (done) => {
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -201,9 +271,13 @@ describe("DockerfileInfoImpl", () => {
|
|||
|
||||
describe("getRegistryBaseImage", () => {
|
||||
var domain: string;
|
||||
var baseImage: string;
|
||||
|
||||
beforeEach(() => {
|
||||
domain = "quay.io";
|
||||
baseImage = "coreos/nginx";
|
||||
|
||||
configMock.getDomain.and.returnValue(domain);
|
||||
});
|
||||
|
||||
it("returns null if instance's contents do not contain a 'FROM' command", () => {
|
||||
|
@ -222,7 +296,9 @@ describe("DockerfileInfoImpl", () => {
|
|||
});
|
||||
|
||||
it("returns the registry base image", () => {
|
||||
spyOn(dockerfileInfoImpl, "getBaseImage").and.returnValue(null);
|
||||
spyOn(dockerfileInfoImpl, "getBaseImage").and.returnValue(`${domain}/${baseImage}`);
|
||||
|
||||
expect(dockerfileInfoImpl.getRegistryBaseImage()).toEqual(baseImage);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Reference in a new issue