sufia 6.0.0.rc4 → 6.0.0

data/spec/models/fits_datastream_spec.rb

@@ -118,4 +118,21 @@ describe FitsDatastream, type: :model, unless: $in_travis do
       expect(@myfile.full_text.content).to eq("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nMicrosoft Word - sample.pdf.docx\n\n\n \n \n\n \n\n \n\n \n\nThis PDF file was created using CutePDF. \n\nwww.cutepdf.com")
     end
   end
+
+  describe "m4a" do
+    before do
+      @myfile = GenericFile.new(id: 'foo123')
+      @myfile.add_file(File.open(fixture_path + '/spoken-text.m4a', 'rb').read, path: 'content', original_name: 'spoken-text.m4a', mime_type: 'audio/mp4a-latm')
+      @myfile.apply_depositor_metadata('agw13')
+      # characterize method saves
+      @myfile.characterize
+      @myfile.reload
+    end
+
+    it "should return expected content for full text" do
+      expect(@myfile.full_text.content).to eq("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nLavf56.15.102")
+    end
+  end
+
+
 end

data/spec/models/generic_file_spec.rb

@@ -8,6 +8,14 @@ describe GenericFile, :type => :model do
     @file.apply_depositor_metadata(user.user_key)
   end
 
+  context "when it is initialized" do
+    it "has empty arrays for all the properties" do
+      subject.attributes.each do |k,v|
+        expect(Array(v)).to eq([])
+      end
+    end
+  end
+
   describe "created for someone (proxy)" do
     before do
       @transfer_to = FactoryGirl.find_or_create(:jill)
@@ -265,7 +273,7 @@ describe GenericFile, :type => :model do
 
   describe "to_solr" do
     before do
-      allow(subject).to receive(:id).and_return('stubbed_pid')
+      allow(subject).to receive(:id).and_return('stubbed_id')
       subject.part_of = ["Arabiana"]
       subject.contributor = ["Mohammad"]
       subject.creator = ["Allah"]

data/spec/models/proxy_deposit_request_spec.rb

@@ -13,7 +13,7 @@ describe ProxyDepositRequest, type: :model do
   end
 
   subject do
-    ProxyDepositRequest.new(pid: file.id, sending_user: sender,
+    ProxyDepositRequest.new(generic_file_id: file.id, sending_user: sender,
       receiving_user: receiver, sender_comment: "please take this")
   end
 
@@ -78,7 +78,7 @@ describe ProxyDepositRequest, type: :model do
         subject.transfer_to = receiver.user_key
         subject.save!
         proxy_request = receiver.proxy_deposit_requests.first
-        expect(proxy_request.pid).to eq(file.id)
+        expect(proxy_request.generic_file_id).to eq(file.id)
         expect(proxy_request.sending_user).to eq(sender)
       end
     end
@@ -92,12 +92,24 @@ describe ProxyDepositRequest, type: :model do
     end
 
     context 'when the file is already being transferred' do
+      let(:subject2) {ProxyDepositRequest.new(generic_file_id: file.id, sending_user: sender, receiving_user: receiver2, sender_comment: 'please take this')}
+
       it 'raises an error' do
         subject.save!
-        subject2 = ProxyDepositRequest.new(pid: file.id, sending_user: sender, receiving_user: receiver2, sender_comment: 'please take this')
         expect(subject2).not_to be_valid
         expect(subject2.errors[:open_transfer]).to eq(['must close open transfer on the file before creating a new one'])
       end
+
+      context 'when the first transfer is closed' do
+        before do
+          subject.status = 'accepted'
+        end
+
+        it 'does not raise an error' do
+          subject.save!
+          expect(subject2).to be_valid
+        end
+      end
     end
   end
 end

data/spec/services/generic_file_audit_service_spec.rb

@@ -52,7 +52,7 @@ describe Sufia::GenericFileAuditService do
 
     context "when no audit is pasing" do
       before do
-       ChecksumAuditLog.create!(pass: 1, pid: f.id, version: f.content.versions.first.label, dsid: 'content')
+       ChecksumAuditLog.create!(pass: 1, generic_file_id: f.id, version: f.content.versions.first.label, dsid: 'content')
       end
 
       it "should report that audits have not been run" do

data/spec/support/features.rb

@@ -7,6 +7,7 @@ require File.expand_path('../locations', __FILE__)
 require File.expand_path('../poltergeist', __FILE__)
 require File.expand_path('../cleaner', __FILE__)
 require File.expand_path('../statistic_helper', __FILE__)
+require File.expand_path('../rake_output', __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature

data/spec/support/rake_output.rb

@@ -0,0 +1,20 @@
+module RakeOutput
+
+  # saves original $stdout in variable
+  # set $stdout as local instance of StringIO
+  # yields to code execution
+  # returns the local instance of StringIO
+  # resets $stdout to original value
+  def capture_stdout
+    out = StringIO.new
+    $stdout = out
+    yield
+    return out.string
+  ensure
+    $stdout = STDOUT
+  end
+
+  RSpec.configure do |config|
+    config.include RakeOutput
+  end
+end

data/spec/tasks/rake_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'rake'
+
+describe "Rake tasks" do
+
+  describe "sufia:empty_batches" do
+    before do
+      load File.expand_path("../../../sufia-models/lib/tasks/batch_cleanup.rake", __FILE__)
+      Rake::Task.define_task(:environment)
+    end
+    after { Rake::Task["sufia:empty_batches"].reenable }
+    subject { capture_stdout { Rake::Task["sufia:empty_batches"].invoke } }
+    
+    context "without an empty batch" do
+      it { is_expected.to be_empty }
+    end
+    
+    context "with an empty batch" do
+      before { Batch.create("empty-batch") }
+      it { is_expected.to start_with("empty-batch contains no files - to delete, rerun with the remove option") }
+      
+      describe "removing the empty batch" do
+        subject { capture_stdout { Rake::Task["sufia:empty_batches"].invoke("remove") } }
+        it { is_expected.to start_with("empty-batch contains no files - deleted") }
+      end
+    end
+  end
+
+  describe "sufia:migrate" do
+    let(:namespaced_id) { "sufia:123" }
+    let(:corrected_id)  { "123" }
+    before do
+      load File.expand_path("../../../sufia-models/lib/tasks/migrate.rake", __FILE__)
+      Rake::Task.define_task(:environment)
+    end
+
+    describe "deleting the namespace from ProxyDepositRequest#generic_file_id" do
+      let(:sender) { FactoryGirl.find_or_create(:jill) }
+      let(:receiver) { FactoryGirl.find_or_create(:archivist) }
+      before do
+        ProxyDepositRequest.create(generic_file_id: namespaced_id, sending_user: sender, receiving_user: receiver, sender_comment: "please take this")
+        Rake::Task["sufia:migrate:proxy_deposits"].invoke
+      end
+      subject { ProxyDepositRequest.first.generic_file_id }
+      it { is_expected.to eql corrected_id }
+    end
+
+    describe "deleting the namespace from ChecksumAuditLog#generic_file_id" do
+      before do
+        ChecksumAuditLog.create(generic_file_id: namespaced_id)
+        Rake::Task["sufia:migrate:audit_logs"].invoke
+      end
+      subject { ChecksumAuditLog.first.generic_file_id }
+      it { is_expected.to eql corrected_id }
+    end
+  end
+
+end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,3 @@
-gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
+gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
+
+

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

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe 'batch/edit.html.erb' do
-  let(:batch) { stub_model(Batch, id: '123') }
-  let(:generic_file) { stub_model(GenericFile, id: nil, depositor: 'bob', rights: ['']) }
+  let(:batch) { Batch.create }
+  let(:generic_file) do
+    GenericFile.new(title: ['some title']).tap do |f|
+      f.apply_depositor_metadata("bob")
+    end
+  end
   let(:form) { Sufia::Forms::BatchEditForm.new(generic_file) }
 
   before do

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'catalog/index.html.erb' do
 
-  let(:collection) { Collection.new(title: 'collection1', id: 'abc123') }
+  let(:collection) { stub_model(Collection, title: 'collection1', id: 'abc123') }
   let(:doc) { SolrDocument.new(collection.to_solr) }
 
   before do

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

@@ -15,13 +15,17 @@ describe 'catalog/_sort_and_per_page.html.erb', :type => :view do
     allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
   end
 
-
-
   it 'appears on page without error' do
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_selector('span.page_entries', count: 1)
     expect(rendered).to include("<strong>4</strong> - <strong>6</strong> of <strong>20</strong>")
   end
+  
+  it 'displays the relevance option for sorting' do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(rendered).to include("<li><a href=\"/catalog?sort=score+desc%2C+date_uploaded_dtsi+desc\">relevance</a></li>")
+  end
 
 end

data/spec/views/dashboard/index_spec.rb

@@ -15,11 +15,17 @@ describe "dashboard/index.html.erb", :type => :view do
     allow(@user).to receive(:total_file_views).and_return(1)
     allow(@user).to receive(:total_file_downloads).and_return(3)
     allow(controller).to receive(:current_user).and_return(@user)
+    @ability = instance_double("Ability")
+    allow(controller).to receive(:current_ability).and_return(@ability)
+    allow(@ability).to receive(:can?).with(:create, GenericFile).and_return(can_create_file)
+    allow(@ability).to receive(:can?).with(:create, Collection).and_return(can_create_collection)
     allow(view).to receive(:number_of_files).and_return("15")
     allow(view).to receive(:number_of_collections).and_return("3")
     assign(:activity, [])
     assign(:notifications, [])
   end
+  let(:can_create_file) { true }
+  let(:can_create_collection) { true }
 
   describe "heading" do
 
@@ -36,6 +42,19 @@ describe "dashboard/index.html.erb", :type => :view do
       expect(@heading).to include "Hello, Charles Francis Xavier"
     end
 
+    context "when the user can't create files" do
+      let(:can_create_file) { false }
+      it "should not display the upload button" do
+        expect(@heading).not_to have_link("Upload", sufia.new_generic_file_path)
+      end
+    end
+    context "when the user can't create collections" do
+      let(:can_create_collection) { false }
+      it "should not display the create collection button" do
+        expect(@heading).not_to have_link("Create Collection", collections.new_collection_path)
+      end
+    end
+
   end
 
   describe "sidebar" do
@@ -94,7 +113,6 @@ describe "dashboard/index.html.erb", :type => :view do
     end
 
     context "with notifications" do
-
       before do
         assign(:notifications, FactoryGirl.create(:user_with_mail).mailbox.inbox)
       end
@@ -115,7 +133,37 @@ describe "dashboard/index.html.erb", :type => :view do
         render
         expect(rendered).to include "Single File 1"
       end
+    end
 
+    context 'with transfers' do
+      let(:user) { FactoryGirl.find_or_create(:jill) }
+      let(:another_user) { FactoryGirl.find_or_create(:archivist) }
+      let(:title1) { 'foobar' }
+      let(:title2) { 'bazquux' }
+
+      before do
+        GenericFile.new(title: [title1]).tap do |f|
+          f.apply_depositor_metadata(another_user.user_key)
+          f.save!
+          f.request_transfer_to(user)
+        end
+        GenericFile.new(title: [title2]).tap do |f|
+          f.apply_depositor_metadata(user.user_key)
+          f.save!
+          f.request_transfer_to(another_user)
+        end
+        allow(controller).to receive(:current_user).and_return(user)
+        assign(:incoming, ProxyDepositRequest.where(receiving_user_id: user.id))
+        assign(:outgoing, ProxyDepositRequest.where(sending_user_id: user.id))
+      end
+
+      it 'renders received and sent transfer requests' do
+        render
+        expect(rendered).not_to include "You haven't received any file transfers requests"
+        expect(rendered).not_to include "You haven't transferred any files"
+        expect(rendered).to include title1
+        expect(rendered).to include title2
+      end
     end
 
     context "without activities and notifications" do

data/spec/views/generic_file/_browse_everything.html.erb_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'generic_files/_browse_everything.html.erb', :type => :view do
+  it 'shows user timing warning' do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_selector('div.alert-success', text: /Please note that if you upload a large number of files/i , count: 1)
+  end
+end

data/spec/views/generic_file/show.html.erb_spec.rb

@@ -16,7 +16,7 @@ describe 'generic_files/show.html.erb', :type => :view do
       depositor: depositor.user_key,
       audit_stat: 1,
       title: ['My Title'],
-      description: ['Lorem ipsum lorem ipsum.'],
+      description: ['Lorem ipsum lorem ipsum. http://my.link.com'],
       tag: ['bacon', 'sausage', 'eggs'],
       rights: ['http://example.org/rights/1'],
       based_near: ['Seattle, WA, US'],
@@ -55,6 +55,16 @@ describe 'generic_files/show.html.erb', :type => :view do
       h1 = doc.xpath("//h1[@class='visibility']").text
       expect(h1).to start_with 'My Title'
     end
+
+    it 'shows the description' do
+      d1 = doc.xpath("//p[@class='genericfile_description']").text
+      expect(d1).to start_with 'Lorem ipsum'
+    end
+
+    it 'shows links in the description' do
+      a1 = doc.xpath("//p[@class='genericfile_description']/a").text
+      expect(a1).to start_with 'http://my.link.com'
+    end
   end
 
   describe 'schema.org' do
@@ -68,11 +78,6 @@ describe 'generic_files/show.html.erb', :type => :view do
         # set itemtype to CreativeWork
         expect(item.type).to eq('http://schema.org/CreativeWork')
 
-        # set title as name
-        expect(item.properties['name'].first).to eq('My Title')
-
-        expect(item.properties['description'].first).to eq('Lorem ipsum lorem ipsum.')
-
         # tag as keywords
         expect(item.properties['keywords']).to include('bacon', 'sausage', 'eggs')
 
@@ -168,7 +173,7 @@ describe 'generic_files/show.html.erb', :type => :view do
       expect(tag.attribute('content').value).to eq('My Title')
 
       tag = doc.xpath("//meta[@property='og:description']")
-      expect(tag.attribute('content').value).to eq('Lorem ipsum lorem ipsum.')
+      expect(tag.attribute('content').value).to eq('Lorem ipsum lorem ipsum. http://my.link.com')
 
       tag = doc.xpath("//meta[@property='og:image']")
       expect(tag.attribute('content').value).to eq('http://test.host/downloads/123?file=thumbnail')
@@ -265,7 +270,7 @@ describe 'generic_files/show.html.erb', :type => :view do
       render
     end
     it "should display the visibility badge" do
-      expect(rendered).to include('<span class="label label-danger" title="'+t('sufia.visibility.private')+'">'+t('sufia.visibility.private')+'</span></a>')
+      expect(rendered).to include('<span class="label label-danger" title="'+t('sufia.visibility.private_title_attr')+'">'+t('sufia.visibility.private')+'</span></a>')
     end
   end
 

data/spec/views/homepage/_home_header.html.erb_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe "homepage/_home_header.html.erb" do
+  let(:groups) { [] }
+  let(:ability) { instance_double("Ability") }
+  describe "share your work button" do
+    before do
+      allow(controller).to receive(:current_ability).and_return(ability)
+      allow(ability).to receive(:can?).with(:view_share_work, GenericFile).and_return(can_view_share_work)
+      stub_template "homepage/_marketing.html.erb" => "marketing"
+      render
+    end
+    context "when the user can view" do
+      let(:can_view_share_work) { true }
+      it "should display" do
+        expect(rendered).to have_content t("sufia.share_button")
+      end
+    end
+    context "when the user can't view" do
+      let(:can_view_share_work) { false }
+      it "should not display" do
+        expect(rendered).not_to have_content t("sufia.share_button")
+      end
+    end
+  end
+end

data/spec/views/users/_user_util_links.html.erb_spec.rb

@@ -6,9 +6,12 @@ describe '/_user_util_links.html.erb', :type => :view do
   before do
     allow(view).to receive(:user_signed_in?).and_return(true)
     allow(view).to receive(:current_user).and_return(stub_model(User, user_key: 'userX'))
+    allow(view).to receive(:can?).with(:create, GenericFile).and_return(can_create_file)
     assign :notify_number, 8
   end
 
+  let(:can_create_file) { true }
+
   it 'should have link to dashboard' do
     render
     page = Capybara::Node::Simple.new(rendered)
@@ -21,5 +24,22 @@ describe '/_user_util_links.html.erb', :type => :view do
     expect(page).to have_link('my profile', href: '/users/userX')
   end
 
+  describe "upload button" do
+    before do
+      render
+    end
+    context "when the user can create generic files" do
+      it "should have a link to upload" do
+        expect(rendered).to have_link('upload', href: '/files/new')
+      end
+    end
+    context "when the user can't create generic files" do
+      let(:can_create_file) { false }
+      it "should not have a link to upload" do
+        expect(rendered).not_to have_link('upload')
+      end
+    end
+  end
+
 end