better mocking of FileReader and events

This commit is contained in:
alecmerdler 2017-03-11 17:45:36 -08:00
parent ade4216642
commit 7416534ab8
3 changed files with 35 additions and 20 deletions

View file

@ -1,19 +1,35 @@
import { DataFileServiceImpl } from './datafile.service.impl'; import { DataFileServiceImpl } from './datafile.service.impl';
import { Mock } from 'ts-mocks';
describe("DataFileServiceImpl", () => { describe("DataFileServiceImpl", () => {
var dataFileServiceImpl: DataFileServiceImpl; var dataFileServiceImpl: DataFileServiceImpl;
var fileReaderMock: Mock<FileReader>;
var fileReader: FileReader;
beforeEach(() => { beforeEach(() => {
dataFileServiceImpl = new DataFileServiceImpl(); fileReaderMock = new Mock<FileReader>();
fileReader = fileReaderMock.Object;
dataFileServiceImpl = new DataFileServiceImpl(() => fileReader);
}); });
describe("blobToString", () => { describe("blobToString", () => {
beforeEach(() => {
fileReaderMock.setup(mock => mock.readAsText).is((blob: Blob) => {
fileReaderMock.Object.onload(<any>{target: {result: blob.toString()}});
});
});
}); });
describe("arrayToString", () => { describe("arrayToString", () => {
beforeEach(() => {
fileReaderMock.setup(mock => mock.readAsArrayBuffer).is((blob: Blob) => {
fileReaderMock.Object.onload(<any>{target: {result: blob.toString()}});
});
});
}); });
describe("readDataArrayAsPossibleArchive", () => { describe("readDataArrayAsPossibleArchive", () => {

View file

@ -8,9 +8,13 @@ declare const Untar: (uint8Array: Uint8Array) => void;
@Injectable(DataFileService.name) @Injectable(DataFileService.name)
export class DataFileServiceImpl implements DataFileService { export class DataFileServiceImpl implements DataFileService {
constructor(private fileReaderFactory: () => FileReader) {
}
public blobToString(blob: any, callback: (result: string) => void): void { public blobToString(blob: any, callback: (result: string) => void): void {
var reader: FileReader = new FileReader(); var reader: FileReader = new FileReader();
reader.onload = (event: Event) => callback(reader.result); reader.onload = (event: Event) => callback(event.target['result']);
reader.readAsText(blob); reader.readAsText(blob);
} }

View file

@ -9,51 +9,46 @@ describe("DockerfileServiceImpl", () => {
var dataFileServiceMock: Mock<DataFileService>; var dataFileServiceMock: Mock<DataFileService>;
var dataFileService: DataFileService; var dataFileService: DataFileService;
var configMock: any; var configMock: any;
var fileReaderMock: FileReader; var fileReaderMock: Mock<FileReader>;
beforeEach(() => { beforeEach(() => {
dataFileServiceMock = new Mock<DataFileService>(); dataFileServiceMock = new Mock<DataFileService>();
dataFileService = dataFileServiceMock.Object; dataFileService = dataFileServiceMock.Object;
configMock = jasmine.createSpyObj('configMock', ['getDomain']); configMock = jasmine.createSpyObj('configMock', ['getDomain']);
fileReaderMock = new FileReader(); fileReaderMock = new Mock<FileReader>();
dockerfileServiceImpl = new DockerfileServiceImpl(dataFileService, configMock, () => fileReaderMock); dockerfileServiceImpl = new DockerfileServiceImpl(dataFileService, configMock, () => fileReaderMock.Object);
}); });
describe("getDockerfile", () => { describe("getDockerfile", () => {
var file: any; var file: any;
var invalidArchiveFile: any[]; var invalidArchiveFile: any[];
var validArchiveFile: any[]; var validArchiveFile: any[];
var readAsFileBufferSpy: Spy;
var forDataSpy: Spy; var forDataSpy: Spy;
beforeEach(() => { beforeEach(() => {
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("")}];
dataFileServiceMock.setup(mock => mock.readDataArrayAsPossibleArchive).is((buf, success, failure) => { dataFileServiceMock.setup(mock => mock.readDataArrayAsPossibleArchive).is((buf, success, failure) => {
failure([]); failure([]);
}); });
dataFileServiceMock.setup(mock => mock.arrayToString).is((buf, callback) => { dataFileServiceMock.setup(mock => mock.arrayToString).is((buf, callback) => callback(""));
callback("");
});
dataFileServiceMock.setup(mock => mock.blobToString).is((blob, callback) => { dataFileServiceMock.setup(mock => mock.blobToString).is((blob, callback) => callback(blob.toString()));
callback(blob.toString());
});
forDataSpy = spyOn(DockerfileInfoImpl, "forData").and.returnValue(new DockerfileInfoImpl(file, configMock)); 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"; fileReaderMock.setup(mock => mock.readAsArrayBuffer).is((blob: Blob) => {
validArchiveFile = [{name: 'Dockerfile', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue(file)}]; fileReaderMock.Object.onload(<any>{target: {result: file}});
invalidArchiveFile = [{name: 'main.exe', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue("")}]; });
}); });
it("calls datafile service to read given file as possible archive file", (done) => { it("calls datafile service to read given file as possible archive file", (done) => {
dockerfileServiceImpl.getDockerfile(file) dockerfileServiceImpl.getDockerfile(file)
.then((dockerfile: DockerfileInfoImpl) => { .then((dockerfile: DockerfileInfoImpl) => {
expect(readAsFileBufferSpy.calls.argsFor(0)[0]).toEqual(file); expect((<Spy>fileReaderMock.Object.readAsArrayBuffer).calls.argsFor(0)[0]).toEqual(file);
expect(dataFileService.readDataArrayAsPossibleArchive).toHaveBeenCalled(); expect(dataFileService.readDataArrayAsPossibleArchive).toHaveBeenCalled();
done(); done();
}) })