blacklight 3.8.2 → 4.0.0.pre6

data/test_support/features/saved_searches.feature

@@ -18,9 +18,9 @@ Feature: Saved Searches Page
     When I go to the saved searches page
     Then I should see "You have no saved searches"
     
-  Scenario: Saved Searches not logged in
-    When I go to the saved searches page
-    Then I should see "Sign in"
+  # Scenario: Saved Searches not logged in
+  #   When I go to the saved searches page
+  #   Then I should see "Sign in"
     
   Scenario: Saved Searches
     Given I am logged in as "user1"

data/test_support/features/search.feature

@@ -49,7 +49,7 @@ Feature: Search
     And I should see "inmul"
     And I should see select list "select#search_field" with "Title" selected
     And I should see "1."
-    And I should see "Displaying 1 item"
+    And I should see "1 to 1 of 1"
 
   Scenario: Results Page Shows Vernacular (Linked 880) Fields
     Given I am on the home page
@@ -68,7 +68,7 @@ Feature: Search
     Given I am on the home page
     And I fill in "q" with "history"
     When I press "search"
-    Then I should see select list "select#sort" with field labels "relevance, year, author, title"
+    Then I should see the sort dropdown with values "relevance, year, author, title"
   
   Scenario: Can clear a search
     When I am on the home page
@@ -79,7 +79,7 @@ Feature: Search
     And I should see "All Fields"
     And I should see "history"
     And the "q" field should contain "history"
-    When I follow "start over"
+    When I follow "Start Over"
     Then I should be on "the catalog page"
     And I should see "Welcome!"
     And the "q" field should not contain "history"

data/test_support/features/search_filters.feature

@@ -6,19 +6,19 @@ Feature: Search Filters
   Scenario: Filter a blank search
     Given I am on the home page
     When I follow "Tibetan"
-    Then I should see "Displaying all 6 items"    
-    And I should see the applied facet "Language" with the value "Tibetan (6)"
+    Then I should see "1 - 6 of 6"    
+    And I should see the applied facet "Language" with the value "Tibetan 6"
     When I follow "India"
-    Then I should see "Displaying all 2 items"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
-    And I should see the applied facet "Region" with the value "India (2)"
+    Then I should see "1 - 2 of 2"
+    And I should see the applied facet "Language" with the value "Tibetan 2"
+    And I should see the applied facet "Region" with the value "India 2"
   
   Scenario: Search with no filters applied
     When I am on the home page
     And I fill in "q" with "bod"
     And I press "search"
     Then I should be on "the catalog page"
-    And I should see "Displaying all 3 items"
+    And I should see "1 - 3 of 3"
     And I should not see "No Keywords"
     And I should see "You searched for:"
     And I should see "All Fields"
@@ -29,27 +29,27 @@ Feature: Search Filters
     And I fill in "q" with "history"
     And I press "search"
     Then I should be on "the catalog page"
-    And I should see "Displaying all 9 items"
+    And I should see "1 - 9 of 9"
     And I should not see "No Keywords"
     And I should see "You searched for:"
     And I should see "All Fields"
     And I should see "history"
     When I follow "Tibetan"
-    Then I should see "Displaying all 2 items"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
+    Then I should see "1 - 2 of 2"
+    And I should see the applied facet "Language" with the value "Tibetan 2"
     And I should see "All Fields"
     And I should see "history"
     When I follow "2004"
-    Then I should see "Displaying 1 item"
+    Then I should see "1 to 1 of 1"
     And I should see "You searched for:"
-    And I should see the applied facet "Language" with the value "Tibetan (1)"
-    And I should see the applied facet "Publication Year" with the value "2004 (1)"
+    And I should see the applied facet "Language" with the value "Tibetan 1"
+    And I should see the applied facet "Publication Year" with the value "2004 1"
   
   Scenario: Apply and remove filters
     Given I am on the home page
     When I follow "Tibetan"
     And I should see "Language"
-    And I should see "Tibetan (6)"
+    And I should see "Tibetan 6"
     And I should see "[remove]"
     When I follow "remove"
     Then I should not see "You searched for:"
@@ -66,19 +66,19 @@ Feature: Search Filters
     When I follow "Tibetan"
     Then I should see "You searched for:"
  	And I should see "history"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
+    And I should see the applied facet "Language" with the value "Tibetan 2"
     When I follow "2004"
     And I should see "You searched for:"
 	And I should see "history"
-    And I should see the applied facet "Language" with the value "Tibetan (1)"
-    And I should see the applied facet "Publication Year" with the value "2004 (1)"
+    And I should see the applied facet "Language" with the value "Tibetan 1"
+    And I should see the applied facet "Publication Year" with the value "2004 1"
     When I fill in "q" with "china"
     And I press "search"
     Then I should be on "the catalog page"
     And I should see "All Fields"
 	And I should see "china"
-    And I should see the applied facet "Language" with the value "Tibetan (1)"
-    And I should see the applied facet "Publication Year" with the value "2004 (1)"
+    And I should see the applied facet "Language" with the value "Tibetan 1"
+    And I should see the applied facet "Publication Year" with the value "2004 1"
 
   
   Scenario: Sorting results should retain filters
@@ -91,13 +91,12 @@ Feature: Search Filters
     When I follow "Tibetan"
     And I should see "You searched for:"
  	And I should see "history"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
-    When I select "title" from "sort"
-    And I press "sort results" 
+    And I should see the applied facet "Language" with the value "Tibetan 2"
+    When I sort by "title"
     Then I should be on "the catalog page"
     And I should see "You searched for:"
  	And I should see "history"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
+    And I should see the applied facet "Language" with the value "Tibetan 2"
 
   
   Scenario: Changing per page number should retain filters
@@ -111,11 +110,10 @@ Feature: Search Filters
     And I should see "You searched for:"
  	And I should see "All Fields"
 	And I should see "history"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
-    When I select "20" from "per_page"
-    And I press "update" 
+    And I should see the applied facet "Language" with the value "Tibetan 2"
+    When I show 20 per page
     Then I should be on "the catalog page"
     And I should see "You searched for:"
  	And I should see "history"
-    And I should see the applied facet "Language" with the value "Tibetan (2)"
+    And I should see the applied facet "Language" with the value "Tibetan 2"
 

data/test_support/features/search_history.feature

@@ -6,9 +6,8 @@ Feature: Search History Page
   
   Scenario: Menu Link
     When I am on the home page
-    Then I should see "Search History"
-    When I follow "Search History"
-    Then I should be on the search history page
+    Then I should see "History"
+    When I go to the search history page
     And I should see a stylesheet
   
   Scenario: Have No Searches
@@ -48,12 +47,12 @@ Feature: Search History Page
     And I should be on the search history page
     And I should see a "forget" button
 
-  Scenario: Saving a Search when not logged in
-    Given I have done a search with term "book"
-    And I am on the search history page
-    Then I should see a "save" button
-    When I press "save"
-    Then I should see "Sign in"
+  # Scenario: Saving a Search when not logged in
+  #   Given I have done a search with term "book"
+  #   And I am on the search history page
+  #   Then I should see a "save" button
+  #   When I press "save"
+  #   Then I should see "Sign in"
 
   Scenario: Un-Saving a Search when logged in
     Given I am logged in as "user1"
@@ -81,6 +80,6 @@ Feature: Search History Page
     When I follow "Log Out"
     Then I should see "Login"
     And I should not see "user1"
-    When I follow "Search History"
+    When I go to the search history page
     Then I should not see "book"
       

data/test_support/features/search_sort.feature

@@ -10,10 +10,9 @@ Feature: Search Sort
     Then I should see "Sort by"
 # 2009-08-25 I don't know why this isn't working ... Naomi.
 #    And I should see select list "select#sort" with "relevance" selected
-    When I select "title" from "sort"
-    And I press "sort results" 
+    When I sort by "title"
     Then I should see "Sort by"
-    And I should see select list "select#sort" with "title" selected
+    And I should see the sort list with "title" selected
     
   Scenario: Sort on result set from fielded search
     Given I am on the home page
@@ -21,9 +20,8 @@ Feature: Search Sort
     And I select "Title" from "search_field"
     And I press "search"
     Then I should see "Sort by"
-    When I select "title" from "sort"
-    And I press "sort results"
+    When I sort by "title"
     Then I should see "Sort by"
     And I should see select list "select#search_field" with "Title" selected
-    And I should see select list "select#sort" with "title" selected
+    And I should see the sort list with "title" selected
 

data/test_support/features/step_definitions/general_steps.rb

@@ -9,10 +9,6 @@ Then /^I should see a stylesheet/ do
   page.should have_selector("link[rel=stylesheet]")
 end
 
-Then /^the page title should be "([^"]*)"$/i do |title|
-  page.should have_selector("title", :text => title)
-end
-
 Then /I should see "(.*)" (at least|at most|exactly) (.*) times?$/i do |target, comparator, expected_num|
   actual_num = page.split(target).length - 1
   case comparator

data/test_support/features/step_definitions/search_result_steps.rb

@@ -3,7 +3,8 @@
 
 When /^I fill in the search box with "(.*?)"$/ do |query|
   query.gsub!(/\\"/, '"')
-  fill_in(:q, :with => query)
+#  fill_in(:q, :with => query)
+  find('#q').set(query)
 end
 
 

data/test_support/features/step_definitions/search_steps.rb

@@ -9,11 +9,41 @@ Then /^I should see a selectable list with field choices$/ do
 end
 
 Then /^I should see a selectable list with per page choices$/ do
-  page.should have_selector("select#per_page")
+  page.should have_selector("#per_page-dropdown")
+end
+
+
+When /^I show (\d+) per page$/ do |value|
+  page.should have_selector('#per_page-dropdown') do
+    click_link(value)
+  end
+end
+
+Then /^I should see the sort dropdown$/ do
+  page.should have_selector("#sort-dropdown")
+end
+
+Then /^I should see the sort dropdown with values "([^\"]*)"$/ do |values|
+  page.should have_selector('#sort-dropdown') do
+    labels = values.split(", ")
+    labels.each do |label|
+      with_tag('li', label)
+    end
+  end
+end
+
+Then /^I should see the sort list with "([^\"]*)" selected$/ do |value|
+  page.should have_selector('#sort-dropdown .css-dropdown a', :text => value)
+end
+
+When /^I sort by "([^\"]*)"$/ do |value|
+  page.should have_selector('#sort-dropdown') do
+    click_link(value)
+  end
 end
 
 Then /^I should see a "([^\"]*)" button$/ do |label|
-  page.should have_selector("input[type='submit'][value='#{label}']")
+  page.should have_selector("button[type='submit'] .submit-search-text")
 end
 
 Then /^I should not see the "([^\"]*)" element$/ do |id|

data/test_support/spec/controllers/application_controller_spec.rb

@@ -15,6 +15,14 @@ describe ApplicationController do
         controller.stylesheet_links.should be_empty
       end
     end
+
+    describe "#blacklight_config" do
+
+      it "should provide a default blacklight_config everywhere" do
+        controller.blacklight_config.should == CatalogController.blacklight_config
+      end
+    end
+
   end
 
 end

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -300,7 +300,6 @@ describe CatalogController do
 
     describe "@document" do
       before do
-        @mock_response = mock()
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }])
         @mock_document = mock()
         controller.stub(:find => @mock_response, 
@@ -327,12 +326,13 @@ describe CatalogController do
         end
       end
       before do
-        @mock_response = mock()
-        @mock_document = mock()
         @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }])
         @mock_document = mock()
         controller.stub(:find => @mock_response, 
                         :get_single_doc_via_search => @mock_document)
+
+        controller.stub(:find => @mock_response, 
+                        :get_single_doc_via_search => @mock_document)
       end
 
        before(:each) do
@@ -438,26 +438,11 @@ describe CatalogController do
         request.should redirect_to(catalog_path(doc_id))
       end
     end
-    describe "backwards compatbile send_record_email" do
-      it "should redirect to the sms action when the sms style param is passed" do
-        post :send_email_record, :style=>"sms"
-        request.should redirect_to(sms_catalog_path)
-      end
-      it "should redirect to the email action when the email style param is passed" do
-        post :send_email_record, :style=>"email"
-        request.should redirect_to(email_catalog_path)
-      end
-      it "should not do anything if a bad style is sent" do
-        post :send_email_record, :style=>"bad-style"
-        response.status.should == 404
-      end
-    end
   end
 
   describe "errors" do
     it "should return status 404 for a record that doesn't exist" do
         @mock_response = mock()
-        @mock_document = mock()
         @mock_response.stub(:docs => [])
         @mock_document = mock()
         controller.stub(:find => @mock_response, 

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -24,7 +24,7 @@ def exportable_record
 
   <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
     <subfield code=\"a\">Greer, Lowell.</subfield>
-  </datafield>                                                
+  </datafield>
 
   <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
     <subfield code=\"a\">Lubin, Steven.</subfield>
@@ -68,17 +68,17 @@ describe BlacklightHelper do
   include BlacklightHelper
   include Devise::TestHelpers
   def blacklight_config
-    @config ||= Blacklight::Configuration.new.configure do |config| 
+    @config ||= Blacklight::Configuration.new.configure do |config|
       config.show.html_title = "title_display"
       config.show.heading = "title_display"
       config.show.display_type = 'format'
-      
+
       config.index.show_link = 'title_display'
-      config.index.record_display_type = 'format'   
+      config.index.record_display_type = 'format'
     end
-    
+
     #CatalogController.blacklight_config
-    #@config ||= {:show => {:html_title => 'title_display', :heading => 'title_display', :display_type => 'format'}, :index => { :show_link => 'title_display', :record_display_type => 'format' } }   
+    #@config ||= {:show => {:html_title => 'title_display', :heading => 'title_display', :display_type => 'format'}, :index => { :show_link => 'title_display', :record_display_type => 'format' } }
   end
 
   describe "#application_name", :test => true do
@@ -95,7 +95,9 @@ describe BlacklightHelper do
   describe "link_back_to_catalog" do
     before(:all) do
       @query_params = {:q => "query", :f => "facets", :per_page => "10", :page => "2", :controller=>'catalog'}
+      @bookmarks_query_params = { :page => "2", :controller=>'bookmarks'}
     end
+
     it "should build a link tag to catalog using session[:search] for query params" do
       session[:search] = @query_params
       tag = link_back_to_catalog
@@ -104,8 +106,16 @@ describe BlacklightHelper do
       tag.should =~ /per_page=10/
       tag.should =~ /page=2/
     end
+
+    it "should build a link tag to bookmarks using session[:search] for query params" do
+      session[:search] = @bookmarks_query_params
+      tag = link_back_to_catalog
+      tag.should =~ /Back to Bookmarks/
+      tag.should =~ /\/bookmarks/
+      tag.should =~ /page=2/
+    end
   end
-  
+
   describe "link_to_query" do
     it "should build a link tag to catalog using query string (no other params)" do
       query = "brilliant"
@@ -143,7 +153,7 @@ describe BlacklightHelper do
     describe "for default arguments" do
       it "should default to omitting :page" do
         search_as_hidden_fields.should have_selector("input[type='hidden']", :count =>8)
-        search_as_hidden_fields.should_not have_selector("input[name='page']") 
+        search_as_hidden_fields.should_not have_selector("input[name='page']")
       end
       it "should not return blacklisted elements" do
         search_as_hidden_fields.should_not have_selector("input[name='action']")
@@ -153,7 +163,7 @@ describe BlacklightHelper do
       describe "for omit_keys parameter" do
         it "should not include those keys" do
            generated = search_as_hidden_fields(:omit_keys => [:per_page, :sort])
-           
+
            generated.should_not have_selector("input[name=sort]")
            generated.should_not have_selector("input[name=per_page]")
 
@@ -187,7 +197,7 @@ describe BlacklightHelper do
 	render_body_class.split(' ').should include('blacklight-123456-abcdef')
       end
    end
-   
+
    describe "document_heading" do
 
      it "should consist of the show heading field when available" do
@@ -206,11 +216,42 @@ describe BlacklightHelper do
      it "should consist of #document_heading wrapped in a <h1>" do
       @document = SolrDocument.new('title_display' => "A Fake Document")
 
-      render_document_heading.should have_selector("h1", :text => document_heading, :count => 1)
+      render_document_heading.should have_selector("h4", :text => document_heading, :count => 1)
       render_document_heading.html_safe?.should == true
      end
    end
 
+   describe "document_index_view_type" do
+     it "should default to 'list'" do
+       document_index_view_type.should == 'list'
+     end
+
+     it "should pluck values out of params" do
+       params[:view] = 'asdf'
+       document_index_view_type.should == 'asdf'
+     end
+   end
+
+   describe "render_document_index" do
+     it "should render the document_list" do
+       @document_list = ['a', 'b']
+       self.stub!(:document_index_view_type) { "gallery" }
+       self.should_receive(:render).with(hash_including(:partial => 'document_gallery'))
+       render_document_index
+     end
+
+     it "should fall back on more specific templates" do
+       @document_list = ['a', 'b']
+       self.stub!(:document_index_view_type) { "gallery" }
+
+       ex = ActionView::MissingTemplate.new [], '', '', '',''
+       self.should_receive(:render).with(hash_including(:partial => 'document_gallery')).and_raise(ex)
+       self.should_receive(:render).with(hash_including(:partial => 'catalog/document_gallery')).and_raise(ex)
+       self.should_receive(:render).with(hash_including(:partial => 'catalog/document_list'))
+       render_document_index
+     end
+   end
+
    describe "document_partial_name" do
      it "should default to 'default' when a format blank" do
        document_partial_name({}).should == "default"
@@ -247,7 +288,7 @@ describe BlacklightHelper do
       @document = SolrDocument.new(data)
       link_to_document(@document, { :label => "title_display" }).should have_selector("a", :text => 'title_display', :count => 1)
      end
-   
+
      it "should accept and return a Proc" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
@@ -285,7 +326,7 @@ describe BlacklightHelper do
 
   describe "render_link_rel_alternates" do
       class MockDocumentAppHelper
-        include Blacklight::Solr::Document        
+        include Blacklight::Solr::Document
       end
       module MockExtension
          def self.extended(document)
@@ -318,7 +359,7 @@ describe BlacklightHelper do
           tag.attributes["rel"].value.should == "alternate"
           tag.attributes["title"].value.should == format.to_s
           tag.attributes["href"].value.should === mock_document_app_helper_url(@document, :format =>format)
-        end        
+        end
       end
     end
     it "respects :unique=>true" do
@@ -339,19 +380,19 @@ describe BlacklightHelper do
 
   describe "with a config" do
     before do
-      @config = Blacklight::Configuration.new.configure do |config| 
+      @config = Blacklight::Configuration.new.configure do |config|
         config.show.html_title = "title_display"
         config.show.heading = "title_display"
         config.show.display_type = 'format'
-        
+
         config.index.show_link = 'title_display'
-        config.index.record_display_type = 'format'   
+        config.index.record_display_type = 'format'
       end
 
       @document = SolrDocument.new('title_display' => "A Fake Document", 'id'=>'8')
       helper.stub(:blacklight_config).and_return(@config)
       helper.stub(:has_user_authentication_provider?).and_return(true)
-      helper.stub(:current_user).and_return(User.new)
+      helper.stub(:current_or_guest_user).and_return(User.new)
     end
     describe "render_index_doc_actions" do
       it "should render partials" do
@@ -372,6 +413,7 @@ describe BlacklightHelper do
       @config = Blacklight::Configuration.new.configure do |config|
         config.add_index_field 'qwer'
         config.add_index_field 'asdf', :helper_method => :render_asdf_index_field
+        config.add_index_field 'highlight', :highlight => true
       end
       helper.stub(:blacklight_config).and_return(@config)
     end
@@ -391,6 +433,14 @@ describe BlacklightHelper do
       value.should == 'custom asdf value'
     end
 
+    it "should check for a highlighted field" do
+      doc = mock()
+      doc.should_not_receive(:get)
+      doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      value = helper.render_index_field_value :document => doc, :field => 'highlight'
+      value.should == '<em>highlight</em>'
+    end
+
     it "should check the document field value" do
       doc = mock()
       doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
@@ -405,13 +455,14 @@ describe BlacklightHelper do
       value.should == 'document mnbv value'
     end
   end
-  
+
 
   describe "render_document_show_field_value" do
     before do
       @config = Blacklight::Configuration.new.configure do |config|
         config.add_show_field 'qwer'
         config.add_show_field 'asdf', :helper_method => :render_asdf_document_show_field
+        config.add_show_field 'highlight', :highlight => true
       end
       helper.stub(:blacklight_config).and_return(@config)
     end
@@ -432,6 +483,16 @@ describe BlacklightHelper do
       value.should == 'custom asdf value'
     end
 
+
+    it "should check for a highlighted field" do
+      doc = mock()
+      doc.should_not_receive(:get)
+      doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
+      value.should == '<em>highlight</em>'
+    end
+
+
     it "should check the document field value" do
       doc = mock()
       doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
@@ -446,5 +507,40 @@ describe BlacklightHelper do
       value.should == 'document mnbv value'
     end
   end
-  
+
+  describe "#should_render_index_field?" do
+    it "should if the document has the field value" do
+      doc = mock()
+      doc.stub(:has?).with('asdf').and_return(true)
+      field_config = mock(:field => 'asdf')
+      helper.should_render_index_field?(doc, field_config).should == true
+    end
+
+    it "should if the document has a highlight field value" do
+      doc = mock()
+      doc.stub(:has?).with('asdf').and_return(false)
+      doc.stub(:has_highlight_field?).with('asdf').and_return(true)
+      field_config = mock(:field => 'asdf', :highlight => true)
+      helper.should_render_index_field?(doc, field_config).should == true
+    end
+  end
+
+
+  describe "#should_render_show_field?" do
+    it "should if the document has the field value" do
+      doc = mock()
+      doc.stub(:has?).with('asdf').and_return(true)
+      field_config = mock(:field => 'asdf')
+      helper.should_render_show_field?(doc, field_config).should == true
+    end
+
+    it "should if the document has a highlight field value" do
+      doc = mock()
+      doc.stub(:has?).with('asdf').and_return(false)
+      doc.stub(:has_highlight_field?).with('asdf').and_return(true)
+      field_config = mock(:field => 'asdf', :highlight => true)
+      helper.should_render_show_field?(doc, field_config).should == true
+    end
+  end
+
 end