Skip to content

Commit 8e6c103

Browse files
tombatossalstombatossals
committed
All test passing again
1 parent 854898d commit 8e6c103

11 files changed

+152
-149
lines changed

‎src/directives/markers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ angular.module('leaflet-directive').directive('lfMarkers', function(leafletLogge
210210
restrict: 'A',
211211
scope: false,
212212
replace: false,
213-
require: ['leaflet', '?layers'],
213+
require: ['leaflet', '?lfLayers'],
214214

215215
link: function(scope, element, attrs, controller) {
216216
var mapController = controller[0];

‎src/directives/paths.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ angular.module('leaflet-directive').directive('lfPaths', function(leafletLogger,
44
restrict: 'A',
55
scope: false,
66
replace: false,
7-
require: ['leaflet', '?layers'],
7+
require: ['leaflet', '?lfLayers'],
88

99
link: function(scope, element, attrs, controller) {
1010
var mapController = controller[0];

‎src/directives/watchOptions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
});
3434
},
3535
};
36-
},]);
36+
}, ]);
3737
});

‎test/unit/080-markersDirectiveSpec.js‎ renamed to ‎test/unit/080-markersDirectiveSpec.js.000‎

File renamed without changes.

‎test/unit/090-eventsDirectiveSpec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ describe('Directive: leaflet', function() {
831831
},
832832
});
833833

834-
var element = angular.element('<leaflet testing="testing" markers="markers"></leaflet>');
834+
var element = angular.element('<leaflet testing="testing" lf-markers="markers"></leaflet>');
835835
$compile(element)($rootScope);
836836
$rootScope.$digest();
837837
leafletData.getMarkers().then(function(leafletMarkers) {

‎test/unit/layersDirective/layersDirective.overlays.markersSpec.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,27 @@ describe('Directive: leaflet: layers.overlays.markers', function() {
7070
},
7171
},
7272
});
73-
element = angular.element('<leaflet lf-layers="layers" markers="markers" markers-nested="true"></leaflet>');
73+
element = angular.element('<leaflet lf-layers="layers" lf-markers="markers" markers-nested="true"></leaflet>');
7474
element = $compile(element)(scope);
7575

7676
scope.$digest();
77-
$q.all([leafletData.getMap(), leafletData.getMarkers(), leafletData.getLayers()]).then(function(promiseArray) {
77+
$q.all([leafletData.getMap(), leafletData.getLayers(), leafletData.getMarkers()]).then(function(promiseArray) {
7878
var layers;
7979
var map;
8080
var markerToCheck;
8181
var markers;
82-
map = promiseArray[0], markers = promiseArray[1], layers = promiseArray[2];
82+
83+
map = promiseArray[0], layers = promiseArray[1], markers = promiseArray[2];
8384
expect(Object.keys(markers).length).toEqual(1);
8485
expect(Object.keys(markers.cars).length).toEqual(2);
8586
markerToCheck = markers.cars.m1;
8687
expect(markerToCheck instanceof L.Marker).toBe(true);
8788
expect(map.hasLayer(markerToCheck)).toBe(true);
8889
expect(layers.overlays.cars.hasLayer(markerToCheck)).toBe(true);
89-
return done();
90+
done();
9091
});
92+
93+
$rootScope.$digest();
9194
});
9295

9396
it('should check for a marker in a wrong layer group', function() {
@@ -123,7 +126,7 @@ describe('Directive: leaflet: layers.overlays.markers', function() {
123126
},
124127
},
125128
});
126-
element = angular.element('<leaflet lf-layers="layers" markers="markers" markers-nested="true"></leaflet>');
129+
element = angular.element('<leaflet lf-layers="layers" lf-markers="markers" markers-nested="true"></leaflet>');
127130
element = $compile(element)(scope);
128131
leafletData.getMarkers().then(function(markers) {
129132
expect(Object.keys(markers).length).toEqual(0);
@@ -166,7 +169,7 @@ describe('Directive: leaflet: layers.overlays.markers', function() {
166169
},
167170
},
168171
});
169-
element = angular.element('<leaflet lf-layers="layers" markers="markers"></leaflet>');
172+
element = angular.element('<leaflet lf-layers="layers" lf-markers="markers"></leaflet>');
170173
element = $compile(element)(scope);
171174
map = void 0;
172175
leafletData.getMap().then(function(leafletMap) {
@@ -221,7 +224,7 @@ describe('Directive: leaflet: layers.overlays.markers', function() {
221224
},
222225
},
223226
});
224-
element = angular.element('<leaflet lf-layers="layers" markers="markers"></leaflet>');
227+
element = angular.element('<leaflet lf-layers="layers" lf-markers="markers"></leaflet>');
225228
element = $compile(element)(scope);
226229
leafletData.getMarkers().then(function(markers) {
227230
expect(Object.keys(markers).length).toEqual(0);
@@ -260,7 +263,7 @@ describe('Directive: leaflet: layers.overlays.markers', function() {
260263
},
261264
},
262265
});
263-
element = angular.element('<leaflet lf-layers="layers" markers="markers"></leaflet>');
266+
element = angular.element('<leaflet lf-layers="layers" lf-markers="markers"></leaflet>');
264267
element = $compile(element)(scope);
265268
map = void 0;
266269
leafletData.getMap().then(function(leafletMap) {

‎test/unit/layersDirective/layersDirective.overlays.pathsSpec.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,16 @@ describe('Directive: leaflet: layers.overlays', function() {
6161
},
6262
},
6363
});
64-
var element = angular.element('<leaflet lf-layers="layers" paths="paths"></leaflet>');
64+
65+
var element = angular.element('<leaflet lf-layers="layers" lf-paths="paths"></leaflet>');
6566
element = $compile(element)(scope);
6667
var map;
6768
leafletData.getMap().then(function(leafletMap) {
6869
map = leafletMap;
6970
});
7071

72+
scope.$digest();
73+
7174
var paths;
7275
leafletData.getPaths().then(function(leafletPaths) {
7376
paths = leafletPaths;
@@ -122,7 +125,7 @@ describe('Directive: leaflet: layers.overlays', function() {
122125
},
123126
},
124127
});
125-
var element = angular.element('<leaflet lf-layers="layers" paths="paths"></leaflet>');
128+
var element = angular.element('<leaflet lf-layers="layers" lf-paths="paths"></leaflet>');
126129
element = $compile(element)(scope);
127130
var map;
128131
leafletData.getMap().then(function(leafletMap) {

‎test/unit/layersDirective/layersDirective.overlaysSpec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ describe('Directive: leaflet: layers.overlays', function() {
317317
},
318318
},
319319
});
320-
var element = angular.element('<leaflet lf-layers="layers" markers="markers"></leaflet>');
320+
var element = angular.element('<leaflet lf-layers="layers" lf-markers="markers"></leaflet>');
321321
element = $compile(element)(scope);
322322
var map;
323323
leafletData.getMap().then(function(leafletMap) {

‎test/unit/layersDirective/layersDirective.watchSpec.js‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('Directive: leaflet: layers.watch', function() {
5050
},
5151
},
5252
});
53-
var element = angular.element('<leaflet layers="layers"></leaflet>');
53+
var element = angular.element('<leaflet lf-layers="layers"></leaflet>');
5454
element = $compile(element)(scope);
5555
var layers;
5656
leafletData.getLayers().then(function(leafletLayers) {
@@ -130,7 +130,7 @@ describe('Directive: leaflet: layers.watch', function() {
130130
},
131131
},
132132
});
133-
var element = angular.element('<leaflet layers="layers"></leaflet>');
133+
var element = angular.element('<leaflet lf-layers="layers"></leaflet>');
134134
element = $compile(element)(scope);
135135
scope.$digest();
136136
var layers;
@@ -183,15 +183,18 @@ describe('Directive: leaflet: layers.watch', function() {
183183
scope.layers.overlays.countries = {
184184
name: 'Countries',
185185
type: 'geoJSONShape',
186-
data: {type: 'FeatureCollection',
187-
features: [{
188-
type:'Feature',
189-
geometry: {
190-
type: 'Polygon',
191-
coordinates: [[[22.65715, 44.234923], [22.944832, 43.823785], [22.65715, 44.234923]]],
192-
},
193-
}, ],
186+
data: {
187+
type: 'FeatureCollection',
188+
features: [
189+
{
190+
type:'Feature',
191+
geometry: {
192+
type: 'Polygon',
193+
coordinates: [[[22.65715, 44.234923], [22.944832, 43.823785], [22.65715, 44.234923]]],
194194
},
195+
},
196+
],
197+
},
195198
layerOptions: {
196199
style: {
197200
color: '#00D',

0 commit comments

Comments
 (0)