Merge 26d3386 into 747089c

pulibrary · Dec 14, 2017 · 41a70ca · 41a70ca
2 parents 747089c + 26d3386
commit 41a70ca
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 365 deletions.
diff --git a/app/controllers/locations/map_controller.rb b/app/controllers/locations/map_controller.rb
diff --git a/app/models/locations/map.rb b/app/models/locations/map.rb
diff --git a/app/views/locations/map/index.html.erb b/app/views/locations/map/index.html.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,4 @@
 Locations::Engine.routes.draw do
-  resources :map, only: [:index]
   resources :hours_locations, path_names: { new: 'create' }
   resources :holding_locations, path_names: { new: 'create' }
   resources :libraries, path_names: { new: 'create' }

diff --git a/lib/locations/version.rb b/lib/locations/version.rb
@@ -1,3 +1,3 @@
 module Locations
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end
diff --git a/locations.gemspec b/locations.gemspec
@@ -31,6 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'database_cleaner', '~> 1.3'
   s.add_development_dependency 'poltergeist'
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'webmock'
   s.add_development_dependency 'rails-controller-testing'
 end
diff --git a/spec/controllers/locations/map_controller_spec.rb b/spec/controllers/locations/map_controller_spec.rb
diff --git a/spec/factories/locations/holding_locations.rb b/spec/factories/locations/holding_locations.rb
@@ -33,36 +33,6 @@
     hours_location { build(:hours_location, hours_locations_args) }
   end
 
-  factory :holding_location_stackmap, class: 'Locations::HoldingLocation' do
-    ignore do
-      library_args nil
-    end
-    label { 'Lewis Library' }
-    aeon_location false
-    recap_electronic_delivery_location false
-    open true
-    requestable false
-    always_requestable false
-    circulates true
-    code 'sci'
-    library { build(:library, library_args) }
-  end
-
-  factory :holding_location_stackmap_closed, class: 'Locations::HoldingLocation' do
-    ignore do
-      library_args nil
-    end
-    label { 'Lewis Library' }
-    aeon_location false
-    recap_electronic_delivery_location false
-    open true
-    requestable false
-    always_requestable false
-    circulates true
-    code 'scilal'
-    library { build(:library, library_args) }
-  end
-
   factory :holding_location_title_locations, class: 'Locations::HoldingLocation' do
     ignore do
       library_args nil

diff --git a/spec/models/locations/map_spec.rb b/spec/models/locations/map_spec.rb
diff --git a/spec/routing/locations/map_routing_spec.rb b/spec/routing/locations/map_routing_spec.rb