blacklight 4.3.0 → 4.4.0

data/spec/controllers/catalog_controller_spec.rb

@@ -21,121 +21,141 @@ describe CatalogController do
       @controller.instance_variable_get("@response")
     end
     
-    it "should have no search history if no search criteria" do
-      controller.should_receive(:get_search_results) 
-      session[:history] = []
-      get :index
-      session[:history].length.should == 0
-    end
+    describe "with format :html" do
+      it "should have no search history if no search criteria" do
+        controller.should_receive(:get_search_results) 
+        session[:history] = []
+        get :index
+        session[:history].length.should == 0
+      end
 
-    # check each user manipulated parameter
-    it "should have docs and facets for query with results", :integration => true do
-      get :index, :q => @user_query
-      assigns_response.docs.size.should > 1
-      assert_facets_have_values(assigns_response.facets)
-    end
-    it "should have docs and facets for existing facet value", :integration => true do
-      get :index, :f => @facet_query
-      assigns_response.docs.size.should > 1
-      assert_facets_have_values(assigns_response.facets)
-    end
-    it "should have docs and facets for non-default results per page", :integration => true do
-      num_per_page = 7
-      get :index, :per_page => num_per_page
-      assigns_response.docs.size.should == num_per_page
-      assert_facets_have_values(assigns_response.facets)
-    end
+      # check each user manipulated parameter
+      it "should have docs and facets for query with results", :integration => true do
+        get :index, :q => @user_query
+        assigns_response.docs.size.should > 1
+        assert_facets_have_values(assigns_response.facets)
+      end
+      it "should have docs and facets for existing facet value", :integration => true do
+        get :index, :f => @facet_query
+        assigns_response.docs.size.should > 1
+        assert_facets_have_values(assigns_response.facets)
+      end
+      it "should have docs and facets for non-default results per page", :integration => true do
+        num_per_page = 7
+        get :index, :per_page => num_per_page
+        assigns_response.docs.size.should == num_per_page
+        assert_facets_have_values(assigns_response.facets)
+      end
 
-    it "should have docs and facets for second page", :integration => true do
-      page = 2
-      get :index, :page => page
-      assigns_response.docs.size.should > 1
-      assigns_response.params[:start].to_i.should == (page-1) * @controller.blacklight_config[:default_solr_params][:rows]
-      assert_facets_have_values(assigns_response.facets)
-    end
+      it "should have docs and facets for second page", :integration => true do
+        page = 2
+        get :index, :page => page
+        assigns_response.docs.size.should > 1
+        assigns_response.params[:start].to_i.should == (page-1) * @controller.blacklight_config[:default_solr_params][:rows]
+        assert_facets_have_values(assigns_response.facets)
+      end
 
-    it "should have no docs or facet values for query without results", :integration => true do
-      get :index, :q => @no_docs_query
+      it "should have no docs or facet values for query without results", :integration => true do
+        get :index, :q => @no_docs_query
 
-      assigns_response.docs.size.should == 0
-      assigns_response.facets.each do |facet|
-        facet.items.size.should == 0
+        assigns_response.docs.size.should == 0
+        assigns_response.facets.each do |facet|
+          facet.items.size.should == 0
+        end
       end
-    end
 
-    it "should have a spelling suggestion for an appropriately poor query", :integration => true do
-      get :index, :q => 'boo'
-      assigns_response.spelling.words.should_not be_nil
-    end
-
-    describe "session" do
-      before do
-        controller.stub(:get_search_results) 
+      it "should have a spelling suggestion for an appropriately poor query", :integration => true do
+        get :index, :q => 'boo'
+        assigns_response.spelling.words.should_not be_nil
       end
-      it "should include :search key with hash" do
-        get :index
-        session[:search].should_not be_nil
-        session[:search].should be_kind_of(Hash)
+
+      describe "session" do
+        before do
+          controller.stub(:get_search_results) 
+        end
+        it "should include :search key with hash" do
+          get :index
+          session[:search].should_not be_nil
+          session[:search].should be_kind_of(Hash)
+        end
+        it "should include search hash with key :q" do
+          get :index, :q => @user_query
+          session[:search].should_not be_nil
+          session[:search].keys.should include(:q)
+          session[:search][:q].should == @user_query
+        end
+        it "should include search hash with key :f" do
+          get :index, :f => @facet_query
+          session[:search].should_not be_nil
+          session[:search].keys.should include(:f)
+          session[:search][:f].should == @facet_query
+        end
+        it "should include search hash with key :per_page" do
+          get :index, :per_page => 10
+          session[:search].should_not be_nil
+          session[:search].keys.should include(:per_page)
+          session[:search][:per_page].should == "10"
+        end
+        it "should include search hash with key :page" do
+          get :index, :page => 2
+          session[:search].should_not be_nil
+          session[:search].keys.should include(:page)
+          session[:search][:page].should == "2"
+        end
+        it "should include search hash with random key" do
+          # cause a plugin might add an unpredictable one, we want to preserve it.
+          get :index, :some_weird_key => "value"
+          session[:search].should_not be_nil
+          session[:search].keys.should include(:some_weird_key)
+          session[:search][:some_weird_key].should == "value"
+        end
       end
-      it "should include search hash with key :q" do
-        get :index, :q => @user_query
-        session[:search].should_not be_nil
-        session[:search].keys.should include(:q)
-        session[:search][:q].should == @user_query
+
+      # check with no user manipulation
+      describe "for default query" do
+        it "should get documents when no query", :integration => true do
+          get :index
+          assigns_response.docs.size.should > 1
+        end
+        it "should get facets when no query", :integration => true do
+          get :index
+          assert_facets_have_values(assigns_response.facets)
+        end
       end
-      it "should include search hash with key :f" do
-        get :index, :f => @facet_query
-        session[:search].should_not be_nil
-        session[:search].keys.should include(:f)
-        session[:search][:f].should == @facet_query
-      end
-      it "should include search hash with key :per_page" do
-        get :index, :per_page => 10
-        session[:search].should_not be_nil
-        session[:search].keys.should include(:per_page)
-        session[:search][:per_page].should == "10"
-      end
-      it "should include search hash with key :page" do
-        get :index, :page => 2
-        session[:search].should_not be_nil
-        session[:search].keys.should include(:page)
-        session[:search][:page].should == "2"
-      end
-      it "should include search hash with random key" do
-        # cause a plugin might add an unpredictable one, we want to preserve it.
-        get :index, :some_weird_key => "value"
-        session[:search].should_not be_nil
-        session[:search].keys.should include(:some_weird_key)
-        session[:search][:some_weird_key].should == "value"
-      end
-    end
-
-    # check with no user manipulation
-    describe "for default query" do
-      it "should get documents when no query", :integration => true do
+
+      it "should render index.html.erb" do
+        controller.stub(:get_search_results)
         get :index
-        assigns_response.docs.size.should > 1
+        response.should render_template(:index)
       end
-      it "should get facets when no query", :integration => true do
+
+      # NOTE: status code is always 200 in isolation mode ...
+      it "HTTP status code for GET should be 200", :integration => true do
         get :index
-        assert_facets_have_values(assigns_response.facets)
+        response.should be_success
       end
     end
 
-    it "should get rss feed", :integration => true do
-      get :index, :format => 'rss'
-      response.should be_success
+    describe "with format :rss" do
+      it "should get the feed", :integration => true do
+        get :index, :format => 'rss'
+        response.should be_success
+      end
     end
 
-    it "should render index.html.erb" do
-      controller.stub(:get_search_results)
-      get :index
-      response.should render_template(:index)
-    end
-    # NOTE: status code is always 200 in isolation mode ...
-    it "HTTP status code for GET should be 200", :integration => true do
-      get :index
-      response.should be_success
+    describe "with format :json" do
+      it "should get the feed" do
+        get :index, :format => 'json'
+        response.should be_success
+        json = JSON.parse response.body
+        json["response"]["pages"]["total_count"].should == 30 
+        json["response"]["pages"]["current_page"].should == 1
+        json["response"]["pages"]["total_pages"].should == 3
+        json["response"]["docs"].size.should == 10
+        json["response"]["docs"].first.keys.should == ["published_display", "author_display", "lc_callnum_display", "pub_date", "subtitle_display", "format", "material_type_display", "title_display", "id", "subject_topic_facet", "language_facet", "score"]
+        json["response"]["facets"].length.should == 9
+        json["response"]["facets"].first.should == {"name"=>"format", "items"=>[{"value"=>"Book", "hits"=>30}]}
+      end
     end
 
   end # describe index action
@@ -159,9 +179,20 @@ describe CatalogController do
 
     doc_id = '2007020969'
 
-    it "should get document", :integration => true do
-      get :show, :id => doc_id
-      assigns[:document].should_not be_nil
+    describe "with format :html" do
+      it "should get document", :integration => true do
+        get :show, :id => doc_id
+        assigns[:document].should_not be_nil
+      end
+    end
+
+    describe "with format :json" do
+      it "should get the feed" do
+        get :show, id: doc_id, format: 'json'
+        response.should be_success
+        json = JSON.parse response.body
+        json["response"]["document"].keys.should == ["author_t", "opensearch_display", "marc_display", "published_display", "author_display", "lc_callnum_display", "title_t", "pub_date", "pub_date_sort", "subtitle_display", "format", "url_suppl_display", "material_type_display", "title_display", "subject_addl_t", "subject_t", "isbn_t", "id", "title_addl_t", "subject_geo_facet", "subject_topic_facet", "author_addl_t", "language_facet", "subtitle_t", "timestamp"]
+      end
     end
     
     describe "previous/next documents" do
@@ -278,21 +309,22 @@ describe CatalogController do
       
 
       after(:each) do
-        SolrDocument.registered_extensions = nil
+        # remove the fake extension
+        SolrDocument.registered_extensions.pop
       end
     end # dynamic export formats
 
   end # describe show action
 
   describe "opensearch" do
-      before do
-        @mock_response = double()
-        @mock_document = double()
-        @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }, { :id => 'my_other_doc'}])
-        @mock_document = double()
-        controller.stub(:find => @mock_response, 
-                        :get_single_doc_via_search => @mock_document)
-      end
+    before do
+      @mock_response = double()
+      @mock_document = double()
+      @mock_response.stub(:docs => [{ :id => 'my_fake_doc' }, { :id => 'my_other_doc'}])
+      @mock_document = double()
+      controller.stub(:find => @mock_response, 
+                      :get_single_doc_via_search => @mock_document)
+    end
     it "should return an opensearch description" do
       get :opensearch, :format => 'xml'
       response.should be_success
@@ -336,6 +368,12 @@ describe CatalogController do
         request.flash[:error].should be_nil
         request.should redirect_to(catalog_path(doc_id))
       end
+
+      it "should render email_sent for XHR requests" do
+        xhr :post, :email, :id => doc_id, :to => 'test_email@projectblacklight.org'
+        expect(request).to render_template 'email_sent'
+        expect(request.flash[:success]).to eq "Email Sent"
+      end
     end
     describe "sms" do
       it "should give error if no phone number is given" do
@@ -347,19 +385,29 @@ describe CatalogController do
         request.flash[:error].should == "You must select a carrier"
       end
       it "should give an error when the phone number is not 10 digits" do
-        post :sms, :id => doc_id, :to => '555555555', :carrier => 'att'
+        post :sms, :id => doc_id, :to => '555555555', :carrier => 'txt.att.net'
         request.flash[:error].should == "You must enter a valid 10 digit phone number"
       end
+      it "should give an error when the carrier is not in our list of carriers" do
+        post :sms, :id => doc_id, :to => '5555555555', :carrier => 'no-such-carrier'
+        request.flash[:error].should == "You must enter a valid carrier"
+      end
       it "should allow punctuation in phone number" do
-        post :sms, :id => doc_id, :to => '(555) 555-5555', :carrier => 'att'
+        post :sms, :id => doc_id, :to => '(555) 555-5555', :carrier => 'txt.att.net'
         request.flash[:error].should be_nil
         request.should redirect_to(catalog_path(doc_id))
       end
       it "should redirect back to the record upon success" do
-        post :sms, :id => doc_id, :to => '5555555555', :carrier => 'att'
+        post :sms, :id => doc_id, :to => '5555555555', :carrier => 'txt.att.net'
         request.flash[:error].should be_nil
         request.should redirect_to(catalog_path(doc_id))
       end
+
+      it "should render sms_sent template for XHR requests" do
+        xhr :post, :sms, :id => doc_id, :to => '5555555555', :carrier => 'txt.att.net'
+        expect(request).to render_template 'sms_sent'
+        expect(request.flash[:success]).to eq "SMS Sent"
+      end
     end
   end
 
@@ -421,6 +469,30 @@ describe CatalogController do
       response.body.should_not =~ /Login/
     end
   end
+
+  describe "facet" do
+    describe "requesting js" do
+      it "should be successful" do
+        xhr :get, :facet, id: 'format'
+        response.should be_successful
+      end
+    end
+    describe "requesting html" do
+      it "should be successful" do
+        get :facet, id: 'format'
+        response.should be_successful
+        assigns[:pagination].should be_kind_of Blacklight::Solr::FacetPaginator
+      end
+    end
+    describe "requesting json" do
+      it "should be successful" do
+        get :facet, id: 'format', format: 'json'
+        response.should be_successful
+        json = JSON.parse(response.body)
+        json["response"]["facets"]["items"].first["value"].should == 'Book'
+      end
+    end
+  end
 end
 
 

data/spec/features/alternate_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Alternate Controller Behaviors" do
+  it "should have the correct per-page form" do
+    visit alternate_index_path
+    page.should have_selector("form[action='#{alternate_index_path}']")
+    fill_in "q", :with=>"history"
+    click_button 'search'
+    expect(current_path).to match /#{alternate_index_path}/
+    click_on '10 per page'
+    expect(current_path).to match /#{alternate_index_path}/
+  end
+
+  it "should have the correct search field form" do
+    visit alternate_index_path
+    page.should have_selector("form[action='#{alternate_index_path}']")
+    fill_in "q", :with=>"history"
+    click_button 'search'
+    expect(current_path).to match /#{alternate_index_path}/
+    click_on 'relevance'
+    expect(current_path).to match /#{alternate_index_path}/
+  end
+
+  it "should display document thumbnails" do
+    visit alternate_index_path
+    page.should have_selector("form[action='#{alternate_index_path}']")
+    fill_in "q", :with=>"history"
+    click_button 'search'
+    expect(page).to have_selector ".document-thumbnail"
+    expect(page).to have_selector ".document-thumbnail a[data-counter]"
+    expect(page).to have_selector ".document-thumbnail a img"
+
+  end
+end

data/spec/features/bookmarks_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "Bookmarks" do
+  describe "navigating from the homepage" do
+    it "should have a link to the history page" do
+      sign_in 'user1'
+      visit root_path
+      click_link 'Bookmarks'
+      expect(page).to have_content 'You have no bookmarks'
+    end
+  end
+
+  it "should clear bookmarks" do
+    visit catalog_path('2007020969')
+    click_button 'Bookmark'
+    click_link 'Bookmarks'
+    click_link 'Clear Bookmarks'
+    expect(page).to have_content 'Cleared your bookmarks.'
+    expect(page).to have_content 'You have no bookmarks'
+  end
+  it "add and remove bookmarks from search results" do
+    sign_in 'user1'
+    visit root_path
+    fill_in "q", with: 'book'
+    click_button 'search'
+    click_button 'Bookmark'
+    expect(page).to have_content 'Successfully added bookmark.'
+    fill_in "q", with: 'book'
+    click_button 'search'
+    click_button 'Remove bookmark'
+    expect(page).to have_content 'Successfully removed bookmark.'
+  end
+        
+  it "should add and delete bookmarks from the show page" do
+    sign_in 'user1'
+    visit catalog_path('2007020969')
+    click_button 'Bookmark'
+    click_button 'Remove bookmark'
+    expect(page).to have_content 'Successfully removed bookmark.'
+  end
+      
+  it "should add bookmarks after a user logs in" do
+    visit catalog_path('2007020969')
+    click_button 'Bookmark'
+    sign_in 'user1'
+    visit bookmarks_path
+    expect(page).to have_button("Remove bookmark")
+    expect(page).to have_content("Strong Medicine speaks")
+  end
+
+  it "should cite items in bookmarks" do
+    visit catalog_path('2007020969')
+    click_button 'Bookmark'
+    click_link 'Bookmarks'
+    click_link 'Cite'
+    expect(page).to have_content 'Strong Medicine speaks'
+  end
+end