Merge pull request #40 from sul-dlss/mapattribution

add mapattribution parameter passing with tests
projectblacklight · Mar 26, 2014 · b31fe40 · b31fe40
2 parents bf2b6a6 + 803091c
commit b31fe40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/helpers/blacklight_maps_helper.rb b/app/helpers/blacklight_maps_helper.rb
@@ -6,7 +6,8 @@ def blacklight_map_tag id, tag_options = {}, &block
     default_data = {
       maxzoom: blacklight_config.view.maps.maxzoom,
       tileurl: blacklight_config.view.maps.tileurl,
-      type: blacklight_config.view.maps.type
+      type: blacklight_config.view.maps.type,
+      mapattribution: blacklight_config.view.maps.mapattribution
     }
 
     options = {id: id, data: default_data}.deep_merge(tag_options)

diff --git a/spec/helpers/blacklight_maps_helper_spec.rb b/spec/helpers/blacklight_maps_helper_spec.rb
@@ -34,12 +34,12 @@ def create_response
     context "with default values" do
       subject { helper.blacklight_map_tag('blacklight-map') }
       it { should have_selector "div#blacklight-map" }
-      it { should have_selector "div[data-maxzoom='8'][data-tileurl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png']" }
+      it { should have_selector "div[data-maxzoom='8'][data-tileurl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'][data-mapattribution='Map data &copy; <a href=\"http://openstreetmap.org\">OpenStreetMap</a> contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>']" }
     end
 
     context "with custom values" do
-      subject { helper.blacklight_map_tag('blacklight-map', data: {maxzoom: 6, tileurl: 'http://example.com/' }) }
-      it { should have_selector "div[data-maxzoom='6'][data-tileurl='http://example.com/']" }
+     subject { helper.blacklight_map_tag('blacklight-map', data: {maxzoom: 6, tileurl: 'http://example.com/', mapattribution: 'hello world' }) }
+     it { should have_selector "div[data-maxzoom='6'][data-tileurl='http://example.com/'][data-mapattribution='hello world']" }
     end
 
     context "when a block is provided" do