sufia 4.0.0.beta4 → 4.0.0.rc1

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "4.0.0.beta4"
+  VERSION = "4.0.0.rc1"
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -54,5 +54,27 @@ describe CatalogController do
         assigns(:document_list).count.should eql(1)
       end
     end
+
+    context "with collections" do
+      before do
+       @collection = Collection.new(title:"my collection", tag: 'rocks').tap do |c|
+         c.apply_depositor_metadata('mjg36')
+         c.save!
+       end
+      end
+
+      after do
+        @collection.destroy
+      end
+
+      it "finds collections and files" do
+        xhr :get, :index, q:"rocks"
+        expect(response).to be_success
+        doc_list = assigns(:document_list)
+        expect(doc_list.map(&:id)).to match_array [@collection.id, @gf1.id]
+      end
+
+    end
+
   end
 end

data/spec/features/browse_dashboard_files_spec.rb

@@ -11,7 +11,7 @@ describe "Browse Dashboard" do
     visit "/dashboard"
     fill_in "q", with: "PDF"
     click_button "search-submit-header"
-    page.should have_content "Fake Document Title"
+    expect(page).to have_content("Fake Document Title")
   end
 
   context "within my files page" do
@@ -21,25 +21,23 @@ describe "Browse Dashboard" do
     end
 
     it "should show me some files" do
-      page.should have_content "Edit File"
-      page.should have_content "Download File"
+      expect(page).to have_content("Edit File")
+      expect(page).to have_content("Download File")
     end
 
     it "should allow you to search your own files" do
       fill_in "q", with: "PDF"
       click_button "search-submit-header"
-      page.should have_content "Fake Document Title"
+      expect(page).to have_content("Fake Document Title")
     end
 
     it "should allow you to browse facets" do
-      pending "Issue #428 is causing this"
       click_link "more Subjects"
       click_link "consectetur"
-      save_and_open_page
       within("#document_#{@fixtures[1].noid}") do
         click_link "Test Document MP3.mp3"
       end
-      page.should have_content "File Details"
+      expect(page).to have_content("File Details")
     end
 
     it "should allow me to edit files (from the fixtures)" do
@@ -47,7 +45,20 @@ describe "Browse Dashboard" do
       click_button "search-submit-header"
       click_button "Select an action"
       click_link "Edit File"
-      page.should have_content "Edit Fake Wav File.wav"
+      expect(page).to have_content("Edit Fake Wav File.wav")
+    end
+
+    it "should refresh the page of files" do
+      click_button "Refresh"
+      expect(page).to have_content("Edit File")
+      expect(page).to have_content("Download File")
+    end
+
+    it "should allow me to edit files in batches" do
+      pending "Need to enable javascript testing"
+      first('input#check_all').click
+      click_button('Edit Selected')
+      expect(page).to have_content('3 files')
     end
 
   end
@@ -58,7 +69,7 @@ describe "Browse Dashboard" do
     end
     it "should search within my collections" do
       within(".input-group-btn") do
-        page.should have_content("My Collections")
+        expect(page).to have_content("My Collections")
       end
     end
   end
@@ -69,7 +80,7 @@ describe "Browse Dashboard" do
     end
     it "should search within my highlights" do
       within(".input-group-btn") do
-        page.should have_content("My Highlights")
+        expect(page).to have_content("My Highlights")
       end
     end
   end
@@ -80,7 +91,7 @@ describe "Browse Dashboard" do
     end
     it "should search within my shares" do
       within(".input-group-btn") do
-        page.should have_content("My Shares")
+        expect(page).to have_content("My Shares")
       end
     end
   end

data/spec/features/catalog_search_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe 'catalog searching' do
+
+  before :all do
+    @gf1 =  GenericFile.new.tap do |f|
+      f.title = 'title 1'
+      f.tag = ["tag1", "tag2"]
+      f.apply_depositor_metadata('jilluser')
+      f.read_groups = ['public']
+      f.save!
+    end
+    @gf2 =  GenericFile.new.tap do |f|
+      f.title = 'title 2'
+      f.tag = ["tag2", "tag3"]
+      f.apply_depositor_metadata('jilluser')
+      f.read_groups = ['public']
+      f.save!
+    end
+    @col =  Collection.new.tap do |f|
+      f.title = 'title 3'
+      f.tag = ["tag3", "tag4"]
+      f.apply_depositor_metadata('jilluser')
+      f.read_groups = ['public']
+      f.save!
+    end
+  end
+
+  after(:all) do
+    User.destroy_all
+    GenericFile.destroy_all
+    Collection.destroy_all
+  end
+
+  before do
+    sign_in :user
+    visit '/'
+  end
+
+  it "finds multiple files" do
+    within('#masthead_controls') do
+      fill_in('search-field-header', with: "tag2")
+      click_button("Go")
+    end
+    expect(page).to have_content('Search Results')
+    expect(page).to have_content(@gf1.title.first)
+    expect(page).to have_content(@gf2.title.first)
+    expect(page).to_not have_content(@col.title)
+  end
+
+  it "finds files and collections" do
+    within('#masthead_controls') do
+      fill_in('search-field-header', with: "tag3")
+      click_button("Go")
+    end
+    expect(page).to have_content('Search Results')
+    expect(page).to have_content(@col.title)
+    expect(page).to have_content(@gf2.title.first)
+    expect(page).to_not have_content(@gf1.title.first)
+  end
+
+  it "finds collections" do
+    within('#masthead_controls') do
+      fill_in('search-field-header', with: "tag4")
+      click_button("Go")
+    end
+    expect(page).to have_content('Search Results')
+    expect(page).to have_content(@col.title)
+    expect(page).to_not have_content(@gf2.title.first)
+    expect(page).to_not have_content(@gf1.title.first)
+  end
+
+  context "many tags" do
+    before do
+      (1..25).each do |i|
+        @gf1.tag << "tag#{i.to_s}"
+      end
+      @gf1.save
+      within('#masthead_controls') do
+        fill_in('search-field-header', with: "tag1")
+        click_button("Go")
+      end
+    end
+
+    it "allows for browsing tags" do
+      expect(page).to have_content('Search Results')
+      within('#facets') do
+        first('a.more_facets_link').click
+        click_link "more Keywords»"
+      end
+      click_link "tag18"
+      expect(page).to have_content "Search Results"
+      click_link @gf1.title[0]
+      expect(page).to have_content "Download"
+      expect(page).to_not have_content "Edit"
+    end
+
+  end
+end

data/spec/features/collection_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'collection' do
   def create_collection(title, description)
+    visit '/dashboard'
     first('#hydra-collection-add').click
     expect(page).to have_content 'Create New Collection'
     fill_in('Title', with: title)
@@ -50,7 +51,6 @@ describe 'collection' do
     end
     it "should create collection from the dashboard and include files", js: true do
       create_collection(title2, description2)
-
       visit '/dashboard/files'
       first('input#check_all').click
       click_button "Add to Collection" # opens the modal

data/spec/helpers/records_helper_spec.rb

@@ -20,7 +20,7 @@ describe RecordsHelper do
     a.attr('data-original-title').should == "Keyword"
     a.attr('id').should == "generic_file_tag_help"
     i = a.children.first
-    i.attr('class').should == 'glyphicon glyphicon-question-sign icon-large'
+    i.attr('class').should == 'glyphicon glyphicon-question-sign large-icon'
   end
 
   describe "download links" do

data/spec/helpers/sufia_helper_spec.rb

@@ -57,10 +57,11 @@ describe SufiaHelper do
       end
     end
     context "for an document object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') }
+      let(:document) { SolrDocument.new( mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', noid_tsi: '1234') }
       it "should show the default thumbnail" do
-        rendered = helper.sufia_thumbnail_tag(document, {})
-        rendered.should match /src="\/assets\/default.png"/
+        rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
+        rendered.should match /src="\/downloads\/1234\?datastream_id=thumbnail"/
+        rendered.should match /width="90"/
       end
     end
   end

data/spec/models/generic_file_spec.rb

@@ -31,15 +31,19 @@ describe GenericFile do
     context "when image?" do
       it "should be true for jpeg2000" do
         subject.mime_type = 'image/jp2'
-        subject.should be_image
+        expect(subject).to be_image
       end
       it "should be true for jpeg" do
         subject.mime_type = 'image/jpg'
-        subject.should be_image
+        expect(subject).to be_image
       end
       it "should be true for png" do
         subject.mime_type = 'image/png'
-        subject.should be_image
+        expect(subject).to be_image
+      end
+      it "should be true for tiff" do
+        subject.mime_type = 'image/tiff'
+        expect(subject).to be_image
       end
     end
     context "when pdf?" do

data/spec/models/solr_document_spec.rb

@@ -1,21 +1,13 @@
 require 'spec_helper'
 
 describe SolrDocument do
-  describe "when mime-type is 'application/mxf'" do
-    before do
-      subject['mime_type_tesim'] = ['application/mxf']
-    end
-    it "should be a video" do
-      subject.should be_video
-    end
-  end
 
   describe "date_uploaded" do
     before do
       subject['desc_metadata__date_uploaded_dtsi'] = '2013-03-14T00:00:00Z'
     end
     it "should be a date" do
-      subject.date_uploaded.should == '03/14/2013'
+      expect(subject.date_uploaded).to eq '03/14/2013'
     end
   end
 
@@ -27,4 +19,30 @@ describe SolrDocument do
       expect(subject.to_param).to eq '1v53kn56d'
     end
   end
+
+  describe "document types" do
+    class Mimes
+      include Sufia::GenericFile::MimeTypes
+    end
+
+    context "when mime-type is 'office'" do
+      it "should be office document" do
+        Mimes.office_document_mime_types.each do |type|
+          subject['mime_type_tesim'] = [type]
+          expect(subject).to be_office_document
+        end
+      end
+    end
+
+    describe "when mime-type is 'video'" do
+      it "should be office" do
+        Mimes.video_mime_types.each do |type|
+          subject['mime_type_tesim'] = [type]
+          expect(subject).to be_video
+        end
+      end
+    end
+
+  end
+
 end

data/spec/services/noid_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Sufia::Noid do
+  describe "#namespaceize" do
+    subject { Sufia::Noid.namespaceize(id) }
+
+    context "when the passed in pid doesn't have a namespace" do
+      let(:id) { 'abc123' }
+      it { should eq 'sufia:abc123' }
+    end
+    context "when the passed in pid has a namespace" do
+      let(:id) { 'ksl:abc123' }
+      it { should eq 'ksl:abc123' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -103,7 +103,7 @@ RSpec.configure do |config|
 
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }
-  
+  config.infer_spec_type_from_file_location!
 end
 
 module FactoryGirl

data/spec/views/batch/edit.html.erb_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'batch/edit.html.erb' do
+  let( :batch ) {
+    stub_model(Batch, id: '123')
+  }
+
+  let(:generic_file) {
+    content = double('content', versions: [], mimeType: 'application/pdf')
+    stub_model(GenericFile, noid: '123',
+               depositor: 'bob',
+               content: content)
+  }
+
+
+  before do
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    controller.request.path_parameters[:id] = "123"
+    assign :batch, batch
+    assign :generic_file, generic_file
+    render
+    @page = Capybara::Node::Simple.new(rendered)
+  end
+
+  it "should draw modal for license" do
+    expect(@page).to have_selector("div#myModal .modal-dialog .modal-content", count: 1)
+  end
+
+  it "should draw modal for rights" do
+    expect(@page).to have_selector("div#rightsModal .modal-dialog .modal-content", count: 1)
+  end
+
+end
+

data/spec/views/my/facet.html.erb_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+# Note: this is a direct copy of the corresponding test in Blacklight
+# with changes for "views/my" instead of "views/catalog"
+
+describe "my/facet.html.erb" do
+  let(:display_facet) { double }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  before do
+    blacklight_config.add_facet_field "xyz", label: "Facet title"
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    stub_template "my/_facet_pagination.html.erb" => "pagination"
+    assign :facet, blacklight_config.facet_fields["xyz"]
+    assign :display_facet, display_facet
+  end
+
+  it "should have the facet title" do
+    allow(view).to receive(:render_facet_limit)
+    render
+    expect(rendered).to have_selector "h3", text: "Facet title"
+  end
+
+  it "should render facet pagination" do
+    allow(view).to receive(:render_facet_limit)
+    render
+    expect(rendered).to have_content "pagination"
+  end
+
+  it "should render the facet limit" do
+    expect(view).to receive(:render_facet_limit).with(display_facet, layout: false)
+    render
+  end
+end

data/sufia-models/app/models/concerns/sufia/generic_file/mime_types.rb

@@ -32,7 +32,7 @@ module Sufia
 
       module ClassMethods
         def image_mime_types
-          ['image/png', 'image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']
+          ['image/png', 'image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif', 'image/tiff']
         end
 
         def pdf_mime_types