Skip to content

Commit

Permalink
Merge f6b763a into adcab25
Browse files Browse the repository at this point in the history
  • Loading branch information
@atd-schubert
atd-schubert committed Jul 18, 2018
2 parents adcab25 + f6b763a commit b244619
Show file tree
Hide file tree
Showing 22 changed files with 463 additions and 463 deletions.
32 changes: 16 additions & 16 deletions ts/attribution-control.directive.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe("Attribution-Control Directive", () => {
control.display = true;
expect(control.getContainer()!.style.display).to.not.equal("none");
});
it("should set to false by removing from map", (done: MochaDone) => {
it("should set to false by removing from map", (done: Mocha.Done) => {

control.displayChange.subscribe((val: boolean) => {
expect(val).to.equal(false);
Expand All @@ -43,7 +43,7 @@ describe("Attribution-Control Directive", () => {

map.removeControl(control);
});
// it.skip("should set to true when adding to map again", (done: MochaDone) => {
// it.skip("should set to true when adding to map again", (done: Mocha.Done) => {
// /* tslint:disable */
// control.displayChange.subscribe((x) => { console.log("aslkdnasnldknaskldnlkd ", x); });
// map.removeControl(control);
Expand Down Expand Up @@ -73,7 +73,7 @@ describe("Attribution-Control Directive", () => {
control.setPosition(val);
expect(control.position ).to.equal(val);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
const val: ControlPosition = "topleft";
control.positionChange.subscribe((eventVal: ControlPosition) => {
expect(eventVal).to.equal(val);
Expand All @@ -82,7 +82,7 @@ describe("Attribution-Control Directive", () => {

control.position = val;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
const val: ControlPosition = "topleft";
control.positionChange.subscribe((eventVal: ControlPosition) => {
expect(eventVal).to.equal(val);
Expand Down Expand Up @@ -115,7 +115,7 @@ describe("Attribution-Control Directive", () => {
control.setPrefix(val);
expect(control.prefix).to.equal(val);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
const val: string = "Attribution-Prefix";
control.prefixChange.subscribe((eventVal: string) => {
expect(eventVal).to.equal(val);
Expand All @@ -124,7 +124,7 @@ describe("Attribution-Control Directive", () => {

control.prefix = val;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
const val: string = "Attribution-Prefix";
control.prefixChange.subscribe((eventVal: string) => {
expect(eventVal).to.equal(val);
Expand All @@ -149,15 +149,15 @@ describe("Attribution-Control Directive", () => {
control.addAttribution("first");
expect(control.attributions).to.deep.equal(["first"]);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
const val: string[] = ["first", "second"];
control.attributionsChange.subscribe((eventVal: string[]) => {
expect(eventVal).to.deep.equal(val);
done();
});
control.attributions = val;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
const val: string[] = ["first"];
control.attributionsChange.subscribe((eventVal: ControlPosition) => {
expect(eventVal).to.deep.equal(val);
Expand All @@ -173,7 +173,7 @@ describe("Attribution-Control Directive", () => {
});
});
describe(".removeAllAttributions()", () => {
it("should emit a event emitter when it is not in silent mode", (done: MochaDone) => {
it("should emit a event emitter when it is not in silent mode", (done: Mocha.Done) => {
control.attributionsChange.subscribe((eventVal: string[]) => {
expect(eventVal).to.deep.equal([]);
done();
Expand Down Expand Up @@ -209,7 +209,7 @@ describe("Attribution-Control Directive", () => {

// Events
describe("(add)", () => {
it("should fire an event when adding to map", (done: MochaDone) => {
it("should fire an event when adding to map", (done: Mocha.Done) => {
map.removeControl(control);

control.addEvent.subscribe(() => {
Expand All @@ -219,7 +219,7 @@ describe("Attribution-Control Directive", () => {
});
});
describe("(remove)", () => {
it("should fire an event when removing from map", (done: MochaDone) => {
it("should fire an event when removing from map", (done: Mocha.Done) => {
control.removeEvent.subscribe(() => {
done();
});
Expand All @@ -228,7 +228,7 @@ describe("Attribution-Control Directive", () => {
});

describe("(click)", () => {
it("should fire an event when firing event from DOM", (done: MochaDone) => {
it("should fire an event when firing event from DOM", (done: Mocha.Done) => {
control.clickEvent.subscribe(() => {
done();
});
Expand All @@ -241,7 +241,7 @@ describe("Attribution-Control Directive", () => {
});
});
describe("(dblclick)", () => {
it("should fire an event when firing event from DOM", (done: MochaDone) => {
it("should fire an event when firing event from DOM", (done: Mocha.Done) => {
control.dblclickEvent.subscribe(() => {
done();
});
Expand All @@ -254,7 +254,7 @@ describe("Attribution-Control Directive", () => {
});
});
describe("(mousedown)", () => {
it("should fire an event when firing event from DOM", (done: MochaDone) => {
it("should fire an event when firing event from DOM", (done: Mocha.Done) => {
control.mousedownEvent.subscribe(() => {
done();
});
Expand All @@ -267,7 +267,7 @@ describe("Attribution-Control Directive", () => {
});
});
describe("(mouseover)", () => {
it("should fire an event when firing event from DOM", (done: MochaDone) => {
it("should fire an event when firing event from DOM", (done: Mocha.Done) => {
control.mouseoverEvent.subscribe(() => {
done();
});
Expand All @@ -280,7 +280,7 @@ describe("Attribution-Control Directive", () => {
});
});
describe("(mouseout)", () => {
it("should fire an event when firing event from DOM", (done: MochaDone) => {
it("should fire an event when firing event from DOM", (done: Mocha.Done) => {
control.mouseoutEvent.subscribe(() => {
done();
});
Expand Down
54 changes: 27 additions & 27 deletions ts/circle-marker.directive.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe("Circle-Marker Directive", () => {
layer.display = true;
expect((layer.getElement() as HTMLElement).style.display).to.not.equal("none");
});
it("should set to false by removing from map", (done: MochaDone) => {
it("should set to false by removing from map", (done: Mocha.Done) => {

layer.displayChange.subscribe((val: boolean) => {
expect(val).to.equal(false);
Expand All @@ -63,7 +63,7 @@ describe("Circle-Marker Directive", () => {

map.removeLayer(layer);
});
it("should set to true when adding to map again", (done: MochaDone) => {
it("should set to true when adding to map again", (done: Mocha.Done) => {
map.removeLayer(layer);
layer.displayChange.subscribe((val: boolean) => {
expect(val).to.equal(true);
Expand All @@ -87,29 +87,29 @@ describe("Circle-Marker Directive", () => {
layer.setLatLng(TEST_VALUE);
expect(layer.position).to.equal(TEST_VALUE);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
layer.positionChange.subscribe((eventVal: LatLng) => {
expect(eventVal).to.equal(TEST_VALUE);
done();
});

layer.position = TEST_VALUE;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
layer.positionChange.subscribe((eventVal: LatLng) => {
expect(eventVal).to.equal(TEST_VALUE);
done();
});

layer.setLatLng(TEST_VALUE);
});
it("should fire geoJSON-change event when changing in Angular", (done: MochaDone) => {
it("should fire geoJSON-change event when changing in Angular", (done: Mocha.Done) => {
layer.geoJSONChange.subscribe(() => {
done();
});
layer.position = TEST_VALUE;
});
it("should fire geoJSON-change event when changing in Leaflet", (done: MochaDone) => {
it("should fire geoJSON-change event when changing in Leaflet", (done: Mocha.Done) => {
layer.geoJSONChange.subscribe(() => {
done();
});
Expand All @@ -133,7 +133,7 @@ describe("Circle-Marker Directive", () => {
layer.setLatLng([val, 0]);
expect(layer.lat).to.equal(val);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
const val: number = randomLat();

layer.latChange.subscribe((eventVal: number) => {
Expand All @@ -143,7 +143,7 @@ describe("Circle-Marker Directive", () => {

layer.lat = val;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
const val: number = randomLat();

layer.latChange.subscribe((eventVal: number) => {
Expand All @@ -170,7 +170,7 @@ describe("Circle-Marker Directive", () => {
layer.setLatLng([0, val]);
expect(layer.lng).to.equal(val);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
const val: number = randomLng();

layer.lngChange.subscribe((eventVal: number) => {
Expand All @@ -180,7 +180,7 @@ describe("Circle-Marker Directive", () => {

layer.lng = val;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
const val: number = randomLng();

layer.lngChange.subscribe((eventVal: number) => {
Expand All @@ -207,7 +207,7 @@ describe("Circle-Marker Directive", () => {
layer.setRadius(val);
expect(layer.radius).to.equal(val);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
const val: number = randomNumber(100);

layer.radiusChange.subscribe((eventVal: number) => {
Expand All @@ -217,7 +217,7 @@ describe("Circle-Marker Directive", () => {

layer.radius = val;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
const val: number = randomNumber(100);

layer.radiusChange.subscribe((eventVal: number) => {
Expand Down Expand Up @@ -257,7 +257,7 @@ describe("Circle-Marker Directive", () => {
layer.geoJSON.geometry.coordinates[1],
).to.equal(TEST_POINT[0]);
});
it("should fire an event when changing in Angular", (done: MochaDone) => {
it("should fire an event when changing in Angular", (done: Mocha.Done) => {
layer.geoJSONChange.subscribe((eventVal: GeoJSONFeature<GeoJSON.Point, any>) => {
expect(
eventVal.geometry.coordinates[0],
Expand All @@ -270,7 +270,7 @@ describe("Circle-Marker Directive", () => {

layer.geoJSON = TEST_GEOJSON;
});
it("should fire an event when changing in Leaflet", (done: MochaDone) => {
it("should fire an event when changing in Leaflet", (done: Mocha.Done) => {
layer.geoJSONChange.subscribe((eventVal: GeoJSONFeature<GeoJSON.Point, any>) => {
const values: [number, number] = (eventVal.geometry.coordinates as any);

Expand Down Expand Up @@ -302,7 +302,7 @@ describe("Circle-Marker Directive", () => {
layerWithProps.properties = TEST_OBJECT;
expect(layerWithProps.properties).to.equal(TEST_OBJECT);
});
it("should emit an event for GeoJSONChange when changing in Angular", (done: MochaDone) => {
it("should emit an event for GeoJSONChange when changing in Angular", (done: Mocha.Done) => {
layerWithProps.geoJSONChange.subscribe(
(val: GeoJSONFeature<GeoJSON.GeometryObject, ITestProperties>) => {
expect(val.properties).to.equal(TEST_OBJECT);
Expand All @@ -315,7 +315,7 @@ describe("Circle-Marker Directive", () => {

// Events
describe("(add)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.addEvent.subscribe((event: any) => {
Expand All @@ -326,7 +326,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(remove)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.removeEvent.subscribe((event: any) => {
Expand All @@ -337,7 +337,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(popupopen)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.popupopenEvent.subscribe((event: any) => {
Expand All @@ -348,7 +348,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(popupclose)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.popupcloseEvent.subscribe((event: any) => {
Expand All @@ -359,7 +359,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(tooltipopen)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.tooltipopenEvent.subscribe((event: any) => {
Expand All @@ -370,7 +370,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(tooltipclose)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.tooltipcloseEvent.subscribe((event: any) => {
Expand All @@ -381,7 +381,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(click)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.clickEvent.subscribe((event: any) => {
Expand All @@ -392,7 +392,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(dblclick)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.dblclickEvent.subscribe((event: any) => {
Expand All @@ -403,7 +403,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(mousedown)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.mousedownEvent.subscribe((event: any) => {
Expand All @@ -414,7 +414,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(mouseover)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.mouseoverEvent.subscribe((event: any) => {
Expand All @@ -425,7 +425,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(mouseout)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.mouseoutEvent.subscribe((event: any) => {
Expand All @@ -436,7 +436,7 @@ describe("Circle-Marker Directive", () => {
});
});
describe("(contextmenu)", () => {
it("should fire event in Angular when firing event in Leaflet", (done: MochaDone) => {
it("should fire event in Angular when firing event in Leaflet", (done: Mocha.Done) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.contextmenuEvent.subscribe((event: any) => {
Expand Down

0 comments on commit b244619

Please sign in to comment.