Skip to content

Commit

Permalink
Merge pull request #49 from sul-dlss/travis
Browse files Browse the repository at this point in the history
removing pegged sprockets and sass-rails
  • Loading branch information
Jessie Keck committed Apr 11, 2014
2 parents 79fbc7a + c4ec95d commit adeef7e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions Gemfile
Expand Up @@ -6,17 +6,6 @@ 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'


file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
if File.exists?(file)
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/blacklight/maps/export_spec.rb
Expand Up @@ -58,7 +58,7 @@
end

it "should render correct sidebar div" do
expect(subject.send(:render_leaflet_sidebar_partial, @response.docs[0])).to include('href="/catalog/2008308478">')
expect(subject.send(:render_leaflet_sidebar_partial, @response.docs[0])).to include('href="/catalog/2008308478')
end

it "should render feature collection as json" do
Expand Down

0 comments on commit adeef7e

Please sign in to comment.