Merge pull request #382 from geoblacklight/add-specs

Add specs and some minor js cleanup

app/assets/javascripts/geoblacklight/viewers/esri.js

@@ -2,11 +2,11 @@
 
 GeoBlacklight.Viewer.Esri = GeoBlacklight.Viewer.Map.extend({
   layerInfo: {},
-  
+
   layerOptions: {
 
     // sets initial layer opacity
-    opacity: 0.75 
+    opacity: 0.75
   },
 
   load: function() {

app/assets/javascripts/geoblacklight/viewers/esri/feature_layer.js

@@ -4,7 +4,7 @@ GeoBlacklight.Viewer.FeatureLayer = GeoBlacklight.Viewer.Esri.extend({
 
   // default feature styles
   defaultStyles: {
-    'esriGeometryPoint': '', 
+    'esriGeometryPoint': '',
     'esriGeometryMultipoint': '',
     'esriGeometryPolyline': {color: 'blue', weight: 3 },
     'esriGeometryPolygon': {color: 'blue', weight: 2 }
@@ -44,8 +44,8 @@ GeoBlacklight.Viewer.FeatureLayer = GeoBlacklight.Viewer.Esri.extend({
     var _this = this;
 
     // lookup style hash based on layer geometry type and return function
-    return function(feature) { 
-      return _this.defaultStyles[_this.layerInfo.geometryType]; 
+    return function(feature) {
+      return _this.defaultStyles[_this.layerInfo.geometryType];
     };
   },
 
@@ -58,15 +58,15 @@ GeoBlacklight.Viewer.FeatureLayer = GeoBlacklight.Viewer.Esri.extend({
   setupInspection: function(featureLayer) {
     var _this = this;
 
-    // inspect on click    
+    // inspect on click
     featureLayer.on('click', function(e) {
       _this.appendLoadingMessage();
 
       // query layer at click location
       featureLayer.query()
       .returnGeometry(false)
       .intersects(e.latlng)
-      .run(function(error, featureCollection, response){
+      .run(function(error, featureCollection, response) {
         if (error) {
           _this.appendErrorMessage();
         } else {

app/assets/javascripts/geoblacklight/viewers/esri/tiled_map_layer.js

@@ -15,7 +15,6 @@ GeoBlacklight.Viewer.TiledMapLayer = GeoBlacklight.Viewer.Esri.extend({
         *        - use Proj4Leaflet
       */
 
-      // 
       var esriTiledMapLayer = L.esri.tiledMapLayer(this.layerOptions);
 
       //setup feature inspection
@@ -25,15 +24,15 @@ GeoBlacklight.Viewer.TiledMapLayer = GeoBlacklight.Viewer.Esri.extend({
     }
   },
 
-  setupInspection: function(layer) { 
+  setupInspection: function(layer) {
     var _this = this;
     this.map.on('click', function(e) {
       _this.appendLoadingMessage();
 
       // query layer at click location
       L.esri.Tasks.identifyFeatures({
-          url: layer.options.url,
-          useCors: true
+        url: layer.options.url,
+        useCors: true
       })
         .tolerance(0)
         .returnGeometry(false)

spec/features/esri_viewer_spec.rb

@@ -1,8 +1,40 @@
 require 'spec_helper'
 
-feature 'feature_layer reference' do
-  scenario 'displays leaflet viewer', js: true do
-    visit catalog_path('minnesota-test-oregon-naip-2011')
+feature 'feature_layer reference', js: true do
+  scenario 'displays image map layer' do
+    visit catalog_path 'minnesota-test-oregon-naip-2011'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+  end
+  scenario 'displays dynamic layer (all layers)' do
+    visit catalog_path 'illinois-f14ff4-1359-4beb-b931-5cb41d20ab90'
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+  end
+  scenario 'displays dynamic layer (single layer)' do
+    visit catalog_path 'maryland-fc5cd2-732d-4559-a9c7-df38dd683aec'
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+  end
+  scenario 'displays feature layer' do
+    visit catalog_path 'minnesota-772ebcaf2ec0405ea1b156b5937593e7_0'
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    pending 'cannot currently test for svg feature'
+    expect(Nokogiri::HTML.parse(page.body).css('g').length).to eq 23
+  end
+  scenario 'displays image map layer' do
+    visit catalog_path 'minnesota-test-oregon-naip-2011'
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css 'img.leaflet-image-layer', visible: true
+  end
+  scenario 'displays tiled map layer' do
+    visit catalog_path 'minnesota-test-soil-survey-map'
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
+  end
+  scenario 'displays Esri WMS layer' do
+    visit catalog_path 'psu-32ef9f-0762-445c-8250-f4a5e220a46d'
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css 'img.leaflet-tile.leaflet-tile-loaded', visible: true
   end
 end