blacklight 4.3.0 → 4.4.0

data/spec/models/{solr_docment_spec.rb → solr_document_spec.rb}

@@ -52,7 +52,7 @@ end
     
     describe "new" do
       it "should take a Hash as the argument" do
-        lambda { SolrDocument.new(@hash_with_marcxml) }.should_not raise_error(ArgumentError)
+        lambda { SolrDocument.new(@hash_with_marcxml) }.should_not raise_error
       end
     end
     

data/spec/spec_helper.rb

@@ -29,7 +29,6 @@ require 'capybara/rspec'
 # Relative to HERE, NOT to Rails.root, which is off somewhere else. 
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
 
-
 RSpec.configure do |config|
   # == Mock Framework
   #

data/spec/support/features.rb

@@ -0,0 +1,7 @@
+# spec/support/features.rb
+
+require File.expand_path("../features/session_helpers.rb", __FILE__)
+
+RSpec.configure do |config|
+  config.include Features::SessionHelpers, type: :feature
+end

data/spec/support/features/session_helpers.rb

@@ -0,0 +1,22 @@
+# spec/support/features/session_helpers.rb
+module Features
+  module SessionHelpers
+    def sign_up_with(email, password)
+      Capybara.exact = true
+      visit new_user_registration_path
+      fill_in 'Email', with: email
+      fill_in 'Password', with: password
+      fill_in 'Password confirmation', with: password
+      click_button 'Sign up'
+    end
+
+    def sign_in(login = 'user1')
+      email = "#{login}@#{login}.com"
+      user = User.create(:email => email, :password => "password", :password_confirmation => "password")
+      visit new_user_session_path
+      fill_in("user_email", :with => email) 
+      fill_in("user_password", :with => "password") 
+      click_button("Sign in")
+    end
+  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,4 @@
 platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jdbc-sqlite3'
   gem 'mediashelf-loggable', '>= 0.4.8'
   gem 'therubyrhino'
@@ -14,9 +13,6 @@ gem 'jquery-rails'
 group :test do
   gem 'rspec-rails', '~> 2.13'
   gem 'generator_spec'
-  gem 'cucumber'
-  gem 'cucumber-rails', :git => 'https://github.com/cucumber/cucumber-rails.git', :branch => 'master_rails4_test',  :require => false
-  gem 'database_cleaner', '>= 1.0.1'
   if defined? :JRUBY_VERSION
     gem 'capybara', '~> 1.0'
   else

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -26,12 +26,6 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'blacklight', '--devise'
   end
 
-  def run_cucumber_generator
-    say_status("warning", "GENERATING cucumber", :yellow)       
-
-    generate 'cucumber:install'
-  end
-
   def run_test_support_generator
     say_status("warning", "GENERATING test_support", :yellow)       
 

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -1,5 +1,4 @@
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 
 desc "run the blacklight gem spec"
 gem_home = File.expand_path('../../../../..', __FILE__)
@@ -12,11 +11,4 @@ namespace :blacklight_test_app do
     t.ruby_opts = "-I#{gem_home}/spec"
   end
 
-  Cucumber::Rake::Task.new({:ok => 'test:prepare'}, 'Run features that should pass') do |t|
-    t.cucumber_opts = gem_home + "/features/**/*.feature"
-  end
-
-  desc 'Alias for cucumber:ok'
-  task :cucumber => 'cucumber:ok'
-
-end
+end

data/spec/views/catalog/_facets.html.erb_spec.rb

@@ -40,9 +40,10 @@ describe "catalog/_facets" do
 
     end 
 
-    it "should have a header" do
+    it "should have a(n accessible) header" do
       render
       rendered.should have_selector('h5')
+      rendered.should have_selector('h5 > a')
     end
 
     it "should list values" do

data/tasks/blacklight.rake

@@ -15,7 +15,6 @@ task :ci => 'jetty:clean' do
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task["blacklight:fixtures"].invoke
     Rake::Task['blacklight:coverage'].invoke
-    Rake::Task['blacklight:cucumber'].invoke
   end
   raise "test failures: #{error}" if error
   # Only create documentation if the tests have passed
@@ -47,15 +46,6 @@ namespace :blacklight do
     end
   end
 
-  desc "Run cucumber features"
-  task :cucumber => [:generate] do |t|
-    within_test_app do
-      system "CUCUMBER_OPTS='../../features' rake blacklight_test_app:cucumber"
-      abort "Error running cucumber" unless $?.success?
-    end
-  end
-  
-
   desc "Clean out the test rails app"
   task :clean do
     puts "Removing sample rails app"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -13,10 +13,11 @@ authors:
 - Mark A. Matienzo
 - Dan Funk
 - Naomi Dushay
+- Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +192,7 @@ files:
 - app/assets/images/blacklight/separator.gif
 - app/assets/images/blacklight/start_over.gif
 - app/assets/images/favicon.ico
+- app/assets/javascripts/blacklight/autofocus.js
 - app/assets/javascripts/blacklight/blacklight.js
 - app/assets/javascripts/blacklight/bookmark_toggle.js
 - app/assets/javascripts/blacklight/checkbox_submit.js
@@ -209,6 +211,7 @@ files:
 - app/assets/stylesheets/blacklight/_dropdown.css.scss
 - app/assets/stylesheets/blacklight/_facets.css.scss
 - app/assets/stylesheets/blacklight/_footer.css.scss
+- app/assets/stylesheets/blacklight/_group.css.scss
 - app/assets/stylesheets/blacklight/_header.css.scss
 - app/assets/stylesheets/blacklight/_layout.css.scss
 - app/assets/stylesheets/blacklight/_mixins.css.scss
@@ -263,6 +266,7 @@ files:
 - app/views/catalog/_facet_pagination.html.erb
 - app/views/catalog/_facet_pivot.html.erb
 - app/views/catalog/_facets.html.erb
+- app/views/catalog/_group_default.html.erb
 - app/views/catalog/_home.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_index_default.html.erb
@@ -281,9 +285,11 @@ files:
 - app/views/catalog/_sms_form.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
 - app/views/catalog/_sort_widget.html.erb
+- app/views/catalog/_thumbnail_default.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/citation.js.erb
 - app/views/catalog/email.html.erb
+- app/views/catalog/email_sent.html.erb
 - app/views/catalog/endnote.endnote.erb
 - app/views/catalog/facet.html.erb
 - app/views/catalog/index.atom.builder
@@ -297,6 +303,7 @@ files:
 - app/views/catalog/show.html.erb
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.html.erb
+- app/views/catalog/sms_sent.html.erb
 - app/views/feedback/complete.html.erb
 - app/views/feedback/show.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
@@ -321,32 +328,6 @@ files:
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.fr.yml
 - config/routes.rb
-- features/bookmarks.feature
-- features/did_you_mean.feature
-- features/librarian_view.feature
-- features/record_view.feature
-- features/saved_searches.feature
-- features/search.feature
-- features/search_filters.feature
-- features/search_history.feature
-- features/search_pagination.feature
-- features/search_results.feature
-- features/search_sort.feature
-- features/step_definitions/bookmarks_steps.rb
-- features/step_definitions/error_steps.rb
-- features/step_definitions/general_steps.rb
-- features/step_definitions/record_view_steps.rb
-- features/step_definitions/saved_searches_steps.rb
-- features/step_definitions/search_facets_steps.rb
-- features/step_definitions/search_history_steps.rb
-- features/step_definitions/search_pagination_steps.rb
-- features/step_definitions/search_result_steps.rb
-- features/step_definitions/search_steps.rb
-- features/step_definitions/user_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/support/paths.rb
-- features/support/selectors.rb
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - lib/SolrMarc.jar
@@ -362,6 +343,7 @@ files:
 - lib/blacklight/controller.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
+- lib/blacklight/facet.rb
 - lib/blacklight/legacy_controller_methods.rb
 - lib/blacklight/mash.rb
 - lib/blacklight/routes.rb
@@ -380,7 +362,10 @@ files:
 - lib/blacklight/solr_helper.rb
 - lib/blacklight/solr_response.rb
 - lib/blacklight/solr_response/facets.rb
+- lib/blacklight/solr_response/group.rb
+- lib/blacklight/solr_response/group_response.rb
 - lib/blacklight/solr_response/more_like_this.rb
+- lib/blacklight/solr_response/pagination_methods.rb
 - lib/blacklight/solr_response/spelling.rb
 - lib/blacklight/user.rb
 - lib/blacklight/utils.rb
@@ -388,6 +373,8 @@ files:
 - lib/generators/blacklight/assets_generator.rb
 - lib/generators/blacklight/blacklight_generator.rb
 - lib/generators/blacklight/jetty_generator.rb
+- lib/generators/blacklight/marc_generator.rb
+- lib/generators/blacklight/models_generator.rb
 - lib/generators/blacklight/templates/alternate_controller.rb
 - lib/generators/blacklight/templates/blacklight.css.scss
 - lib/generators/blacklight/templates/catalog_controller.rb
@@ -413,16 +400,26 @@ files:
 - lib/generators/blacklight/test_support_generator.rb
 - lib/railties/all_tests.rake
 - lib/railties/blacklight.rake
-- lib/railties/blacklight_cucumber.rake
 - lib/railties/blacklight_rspec.rake
 - lib/railties/solr_marc.rake
-- lib/solrmarc.log.1
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
 - spec/data/sample_docs.yml
 - spec/data/test_data.utf8.mrc
+- spec/features/alternate_controller_spec.rb
+- spec/features/bookmarks_spec.rb
+- spec/features/did_you_mean_spec.rb
+- spec/features/librarian_view_spec.rb
+- spec/features/record_view_spec.rb
+- spec/features/saved_searches_spec.rb
+- spec/features/search_filters_spec.rb
+- spec/features/search_history_spec.rb
+- spec/features/search_pagination_spec.rb
+- spec/features/search_results_spec.rb
+- spec/features/search_sort_spec.rb
+- spec/features/search_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
@@ -430,6 +427,8 @@ files:
 - spec/helpers/html_head_helper_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
+- spec/lib/blacklight/solr_response/group_response_spec.rb
+- spec/lib/blacklight/solr_response/group_spec.rb
 - spec/lib/blacklight_configurable_spec.rb
 - spec/lib/blacklight_configuration_spec.rb
 - spec/lib/blacklight_email_spec.rb
@@ -451,13 +450,15 @@ files:
 - spec/models/bookmark_spec.rb
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
-- spec/models/solr_docment_spec.rb
+- spec/models/solr_document_spec.rb
 - spec/rcov.opts
 - spec/requests/alternate_controller_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/assert_difference.rb
+- spec/support/features.rb
+- spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -496,38 +497,24 @@ specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
 test_files:
-- features/bookmarks.feature
-- features/did_you_mean.feature
-- features/librarian_view.feature
-- features/record_view.feature
-- features/saved_searches.feature
-- features/search.feature
-- features/search_filters.feature
-- features/search_history.feature
-- features/search_pagination.feature
-- features/search_results.feature
-- features/search_sort.feature
-- features/step_definitions/bookmarks_steps.rb
-- features/step_definitions/error_steps.rb
-- features/step_definitions/general_steps.rb
-- features/step_definitions/record_view_steps.rb
-- features/step_definitions/saved_searches_steps.rb
-- features/step_definitions/search_facets_steps.rb
-- features/step_definitions/search_history_steps.rb
-- features/step_definitions/search_pagination_steps.rb
-- features/step_definitions/search_result_steps.rb
-- features/step_definitions/search_steps.rb
-- features/step_definitions/user_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/support/paths.rb
-- features/support/selectors.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
 - spec/data/sample_docs.yml
 - spec/data/test_data.utf8.mrc
+- spec/features/alternate_controller_spec.rb
+- spec/features/bookmarks_spec.rb
+- spec/features/did_you_mean_spec.rb
+- spec/features/librarian_view_spec.rb
+- spec/features/record_view_spec.rb
+- spec/features/saved_searches_spec.rb
+- spec/features/search_filters_spec.rb
+- spec/features/search_history_spec.rb
+- spec/features/search_pagination_spec.rb
+- spec/features/search_results_spec.rb
+- spec/features/search_sort_spec.rb
+- spec/features/search_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
@@ -535,6 +522,8 @@ test_files:
 - spec/helpers/html_head_helper_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
+- spec/lib/blacklight/solr_response/group_response_spec.rb
+- spec/lib/blacklight/solr_response/group_spec.rb
 - spec/lib/blacklight_configurable_spec.rb
 - spec/lib/blacklight_configuration_spec.rb
 - spec/lib/blacklight_email_spec.rb
@@ -556,13 +545,15 @@ test_files:
 - spec/models/bookmark_spec.rb
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
-- spec/models/solr_docment_spec.rb
+- spec/models/solr_document_spec.rb
 - spec/rcov.opts
 - spec/requests/alternate_controller_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/assert_difference.rb
+- spec/support/features.rb
+- spec/support/features/session_helpers.rb
 - spec/support/include_text.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb

data/features/bookmarks.feature

@@ -1,68 +0,0 @@
-@bookmarks
-Feature: Bookmarks
-  In order to collect documents
-  As a user
-  I want to bookmark documents
-  
-  Scenario: Bookmarks Menu Link
-    Given I am logged in as "user1"
-    When I am on the home page
-    Then I should see "Bookmarks"
-    When I follow "Bookmarks"
-    Then I should be on the bookmarks page
-    And I should see a stylesheet
-  
-    Scenario: No Bookmarks
-      Given I am logged in as "user1"
-      When I go to the bookmarks page
-      Then I should see "You have no bookmarks"
-        
-    Scenario: Clearing Bookmarks
-      Given I am on the document page for id 2007020969
-      And I press "Bookmark"
-      When I am on the bookmarks page
-      Then I should see "Clear Bookmarks"
-      When I follow "Clear Bookmarks"
-      Then I should see "Cleared your bookmarks."
-      And I should see "You have no bookmarks"
-      
-    Scenario: Adding and removing a bookmark from search results
-      Given I am logged in as "user1"
-      When I am on the home page
-      And I fill in "q" with "book"
-      And I press "search"
-      When I press "Bookmark"
-      Then I should see "Successfully added bookmark."
-      # We should be back on search results here, but due to
-      # what I believe is a bug in Cucumber with query strings
-      # and http Referer, we're not, we're on home page, so we'll
-      # navigate back, sorry. 
-      And I fill in "q" with "book"
-      And I press "search"
-      Then I press "Remove bookmark"
-      And I should see "Successfully removed bookmark."
-      
-    Scenario: Adding and deleting bookmark from show page
-      Given I am logged in as "user1"
-      When I am on the document page for id 2007020969
-      Then I should see a "Bookmark" button
-      And I press "Bookmark"
-      #Then I should see "Successfully added bookmark"
-      And I should see a "Remove bookmark" button
-      And I press "Remove bookmark"
-      And I should see "Successfully removed bookmark"
-      
-    Scenario: Adding bookmarks after a user logs in
-      Given I am on the document page for id 2007020969
-      Then I should see a "Bookmark" button
-      And I press "Bookmark"
-      And I am logged in as "user1"
-      When I go to the bookmarks page
-      Then I should see a "Remove bookmark" button
-
-    Scenario: Citing items in bookmarks
-      Given I am on the document page for id 2007020969
-      And I press "Bookmark"
-      When I go to the bookmarks page
-      And I follow "Cite"
-      Then I should see "Strong Medicine speaks"