Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@HarelM
HarelM committed Jul 30, 2023
1 parent adc37ef commit 7858a38
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 29 deletions.
36 changes: 17 additions & 19 deletions IsraelHiking.Web/src/application/services/file.service.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,105 +157,103 @@ describe("FileService", () => {

it("Should get style json content from remote source", inject([FileService, HttpTestingController],
async (fileService: FileService, mockBackend: HttpTestingController) => {
let promise = fileService.getStyleJsonContent("s.json", false);
const promise = fileService.getStyleJsonContent("s.json", false);

mockBackend.expectOne("s.json").flush({});

let response = await promise;
const response = await promise;
expect(response).toEqual({} as StyleSpecification);
}));

it("Should get style json content from local when offline", inject([FileService, FileSystemWrapper], async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.readAsText = spy.and.returnValue(Promise.resolve("{}"));

let promise = fileService.getStyleJsonContent("./style.json", true);
const promise = fileService.getStyleJsonContent("./style.json", true);

let response = await promise;
const response = await promise;
expect(spy).toHaveBeenCalled();
expect(response).toEqual({} as StyleSpecification);
}));

it("Should get empty style json on failure", inject([FileService, FileSystemWrapper],
async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.readAsText = spy.and.returnValue(Promise.resolve({}));

let promise = fileService.getStyleJsonContent("./style.json", true);
const promise = fileService.getStyleJsonContent("./style.json", true);

let response = await promise;
const response = await promise;
expect(spy).toHaveBeenCalled();
expect(response.layers.length).toBe(0);
expect(response.sources).toEqual({});
}));

it("Should save log to zip file", inject([FileService], async (fileService: FileService) => {
let spy = jasmine.createSpy();

await fileService.saveLogToZipFile("something.zip", "some text");

expect(saveAsSpy).toHaveBeenCalled();
}));

it("Should get gpx file from URL", inject([FileService, FileSystemWrapper],
async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.resolveLocalFilesystemUrl = spy.and.returnValue(Promise.resolve({
file: (cb: any) => { cb(new Blob([]))},
name: "file.gpx"
}))

let file = await fileService.getFileFromUrl("some-file.gpx");
const file = await fileService.getFileFromUrl("some-file.gpx");

expect(file.name).toBe("file.gpx");
expect(file.type).toBe("application/gpx+xml");
}));

it("Should get kml file from URL", inject([FileService, FileSystemWrapper],
async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.resolveLocalFilesystemUrl = spy.and.returnValue(Promise.resolve({
file: (cb: any) => { cb(new Blob([]))},
name: "file.kml"
}))

let file = await fileService.getFileFromUrl("some-file.kml");
const file = await fileService.getFileFromUrl("some-file.kml");

expect(file.name).toBe("file.kml");
expect(file.type).toBe("application/kml+xml");
}));

it("Should get jpg file from URL", inject([FileService, FileSystemWrapper],
async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.resolveLocalFilesystemUrl = spy.and.returnValue(Promise.resolve({
file: (cb: any) => { cb(new Blob([]))},
name: "file.jpg"
}))

let file = await fileService.getFileFromUrl("some-file.jpg");
const file = await fileService.getFileFromUrl("some-file.jpg");

expect(file.name).toBe("file.jpg");
expect(file.type).toBe("image/jpeg");
}));

it("Should get file extention type from URL", inject([FileService, FileSystemWrapper],
async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.resolveLocalFilesystemUrl = spy.and.returnValue(Promise.resolve({
file: (cb: any) => { cb(new Blob([]))},
name: "file.something"
}))

let file = await fileService.getFileFromUrl("some-file.something");
const file = await fileService.getFileFromUrl("some-file.something");

expect(file.name).toBe("file.something");
expect(file.type).toBe("application/something");
}));

it("Should write styles that are sent in a zip", inject([FileService, FileSystemWrapper],
async (fileService: FileService, fileSystemWrapper: FileSystemWrapper) => {
let spy = jasmine.createSpy();
const spy = jasmine.createSpy();
fileSystemWrapper.writeFile = spy;

const zip = new JSZip();
Expand Down
20 changes: 10 additions & 10 deletions IsraelHiking.Web/src/application/services/selected-route-service.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { RoutesFactory } from "./routes.factory";
import { SetSelectedRouteAction, RouteEditingReducer } from "../reducers/route-editing.reducer";
import { ToggleAddRecordingPoiAction } from "../reducers/recorded-route.reducer";
import { AddRouteAction, ChangeRouteStateAction, BulkReplaceRoutesAction, RoutesReducer, MergeRoutesAction, SplitRouteAction, ReplaceRouteAction, UpdateSegmentsAction, DeleteSegmentAction, ReplaceSegmentsAction, AddPrivatePoiAction } from "../reducers/routes.reducer";
import type { MarkerData, RouteData } from "../models/models";
import type { RouteData } from "../models/models";


describe("Selected Route Service", () => {
Expand Down Expand Up @@ -373,7 +373,7 @@ describe("Selected Route Service", () => {
selectedRouteService.splitRoute(1);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(SplitRouteAction);
let action = spy.calls.all()[0].args[0] as SplitRouteAction;
const action = spy.calls.all()[0].args[0] as SplitRouteAction;
expect(action.routeId).toBe("1");
expect(action.routeData.segments.length).toBe(2);
expect(action.routeData.segments[0].latlngs[0].lat).toBe(1);
Expand Down Expand Up @@ -425,7 +425,7 @@ describe("Selected Route Service", () => {
selectedRouteService.splitRoute(1);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(SplitRouteAction);
let action = spy.calls.all()[0].args[0] as SplitRouteAction;
const action = spy.calls.all()[0].args[0] as SplitRouteAction;
expect(action.splitRouteData.name).toBe("name split 2");
}));

Expand Down Expand Up @@ -703,7 +703,7 @@ describe("Selected Route Service", () => {
selectedRouteService.reverseRoute("1");

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(ReplaceRouteAction);
let action = spy.calls.all()[0].args[0] as ReplaceRouteAction;
const action = spy.calls.all()[0].args[0] as ReplaceRouteAction;
expect(action.routeId).toBe("1");
expect(action.routeData.segments.length).toBe(3);
expect(action.routeData.segments[0].latlngs[0].lat).toBe(3);
Expand Down Expand Up @@ -751,7 +751,7 @@ describe("Selected Route Service", () => {
selectedRouteService.removeSegment(0);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(UpdateSegmentsAction);
let action = spy.calls.all()[0].args[0] as UpdateSegmentsAction;
const action = spy.calls.all()[0].args[0] as UpdateSegmentsAction;
expect(action.routeId).toBe("1");
expect(action.indices).toEqual([0, 1]);
expect(action.segmentsData[0].latlngs[0].lat).toBe(2);
Expand Down Expand Up @@ -797,7 +797,7 @@ describe("Selected Route Service", () => {
selectedRouteService.removeSegment(2);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(DeleteSegmentAction);
let action = spy.calls.all()[0].args[0] as DeleteSegmentAction;
const action = spy.calls.all()[0].args[0] as DeleteSegmentAction;
expect(action.routeId).toBe("1");
expect(action.index).toBe(2);
}));
Expand Down Expand Up @@ -841,7 +841,7 @@ describe("Selected Route Service", () => {
await selectedRouteService.removeSegment(1);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(UpdateSegmentsAction);
let action = spy.calls.all()[0].args[0] as UpdateSegmentsAction;
const action = spy.calls.all()[0].args[0] as UpdateSegmentsAction;
expect(action.routeId).toBe("1");
expect(action.indices).toEqual([1, 2]);
expect(action.segmentsData[0].routePoint.lat).toBe(3);
Expand Down Expand Up @@ -890,7 +890,7 @@ describe("Selected Route Service", () => {
selectedRouteService.makeAllPointsEditable("1");

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(ReplaceSegmentsAction);
let action = spy.calls.all()[0].args[0] as ReplaceSegmentsAction;
const action = spy.calls.all()[0].args[0] as ReplaceSegmentsAction;
expect(action.routeId).toBe("1");
expect(action.segmentsData.length).toBe(3);
expect(action.segmentsData[0].latlngs[0].lat).toBe(1);
Expand Down Expand Up @@ -928,7 +928,7 @@ describe("Selected Route Service", () => {
selectedRouteService.addRoutes([{ segments: [], markers: [{ title: "title"}]} as RouteData]);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(AddPrivatePoiAction);
let action = spy.calls.all()[0].args[0] as AddPrivatePoiAction;
const action = spy.calls.all()[0].args[0] as AddPrivatePoiAction;
expect(action.routeId).toBe("1");
expect(action.markerData.title).toBe("title");
}));
Expand All @@ -951,7 +951,7 @@ describe("Selected Route Service", () => {
selectedRouteService.addRoutes([{ name: "name", segments: [{}], markers: [{ title: "title"}]} as RouteData]);

expect(spy.calls.all()[0].args[0]).toBeInstanceOf(AddRouteAction);
let action = spy.calls.all()[0].args[0] as AddRouteAction;
const action = spy.calls.all()[0].args[0] as AddRouteAction;
expect(action.routeData.name).toBe("name 1");
}));
});

0 comments on commit 7858a38

Please sign in to comment.