Skip to content

Commit

Permalink
Add support for latest Blacklight and ActiveFedora
Browse files Browse the repository at this point in the history
  • Loading branch information
awead committed Apr 17, 2015
1 parent 7c00965 commit f0b783d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in hydra-collections.gemspec
gemspec

gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'

group :development, :test do
gem 'sqlite3'
Expand Down
2 changes: 1 addition & 1 deletion spec/test_app_templates/Gemfile.extra
@@ -1 +1 @@
gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
2 changes: 1 addition & 1 deletion spec/views/collections/_thumbnail_default.html.erb_spec.rb
Expand Up @@ -9,7 +9,7 @@
end

before do
assign :response, double(:params => {})
assign :response, double(:params => {}, :start => 0)
allow(view).to receive(:blacklight_config).and_return(blacklight_config)
allow(view).to receive(:render_grouped_response?).and_return(false)
allow(view).to receive(:current_search_session).and_return nil
Expand Down
2 changes: 0 additions & 2 deletions tasks/hydra-collections-dev.rake
Expand Up @@ -3,8 +3,6 @@ require 'rspec/core/rake_task'
require 'jettywrapper'
require 'engine_cart/rake_task'

Jettywrapper.hydra_jetty_version = "v8.1.0"

RSpec::Core::RakeTask.new(:spec) do |spec|
spec.rspec_opts = ['--backtrace'] if ENV['CI']
end
Expand Down

0 comments on commit f0b783d

Please sign in to comment.