Fix merge error.wq

GoogleWebComponents · Feb 5, 2015 · 358e3a6 · 358e3a6
1 parent 5607ff8
commit 358e3a6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/test/marker-basic.html b/test/marker-basic.html
@@ -41,6 +41,7 @@
  assert.isNull(markerEl.map);
  assert.isNull(markerEl.icon);
  assert.isNull(markerEl.info);
+ assert.equal(markerEl.zIndex, 0);
  assert.equal(markerEl.latitude, 37.779);
  assert.equal(markerEl.longitude, -122.3892);
  assert.isNull(markerEl.offsetParent,
@@ -52,13 +53,15 @@
  var markerEl = map.children[0];
  markerEl.latitude = 37.77493;
  markerEl.longitude = -122.41942;
+ markerEl.zIndex = 1;
 
  assert.equal(
  markerEl.map, map.map, "marker's map is not the google-map's");
 
  asyncPlatformFlush(function() {
  assert.equal(markerEl.marker.getPosition().lat(), markerEl.latitude);
  assert.equal(markerEl.marker.getPosition().lng(), markerEl.longitude);
+ assert.equal(markerEl.marker.getZIndex(), markerEl.zIndex);
 
  markerEl.icon = 'https://www.google.com/images/srpr/logo11w.png';
  asyncPlatformFlush(function() {