Merge branch 'master' of github.com:sul-dlss/blacklight-maps

Gemfile

@@ -3,8 +3,21 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in blacklight-maps.gemspec
 gemspec
 
-gem 'simplecov', require: false
-gem 'coveralls', require: false
+# If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the main
+# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
+# it'll want sprockets 2.11.0 and we'll have a conflict
+gem 'sprockets', '2.11.0'
+
+# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main
+# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
+# it'll want sass 3.2.0 and we'll have a conflict
+gem 'sass', '~> 3.2.0'
+gem 'bootstrap-sass', ">= 3.1.1.1"
+
+group :test do
+  gem 'simplecov', require: false
+  gem 'coveralls', require: false
+end
 
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
 if File.exists?(file)

blacklight-maps.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rspec-rails", "~> 2.9"
   spec.add_development_dependency "jettywrapper"
-  spec.add_development_dependency "engine_cart", "~> 0.3.2"
+  spec.add_development_dependency "engine_cart", "~> 0.4.0"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "poltergeist", ">= 1.5.0"
 end