sufia 6.0.0.rc2 → 6.0.0.rc3

data/spec/inputs/select_with_help_input_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'SelectWithHelpInput', type: :input do
+  subject { input_for form, :resource_type, options }
+  let(:file) { GenericFile.new }
+  let(:form) { Sufia::Forms::BatchEditForm.new(file) }
+  let(:base_options) { { as: :select_with_help, collection: Sufia.config.resource_types,
+                         input_html: { class: 'form-control', multiple: true } } }
+  let(:options) { base_options }
+
+  it "should not be required by default" do
+      expect(subject).to have_selector 'select'
+      expect(subject).not_to match /required/
+  end
+end
+

data/spec/jobs/audit_job_spec.rb

@@ -5,7 +5,7 @@ describe AuditJob do
 
   let(:file) do
     GenericFile.create do |file|
-      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       file.apply_depositor_metadata(user)
     end
   end

data/spec/jobs/characterize_job_spec.rb

@@ -5,17 +5,12 @@ describe CharacterizeJob do
     allow_any_instance_of(GenericFile).to receive(:reload_on_save?).and_return(false)
     # Don't actually create the derivatives -- that is tested elsewhere
     allow_any_instance_of(GenericFile).to receive(:create_derivatives)
-    @generic_file = GenericFile.new.tap do |gf|
+    @generic_file = GenericFile.create do |gf|
       gf.apply_depositor_metadata('jcoyne@example.com')
-      gf.add_file(File.open(fixture_path + '/charter.docx'), 'content', 'charter.docx')
-      gf.save
+      gf.add_file(File.open(fixture_path + '/charter.docx'), path: 'content', original_name: 'charter.docx')
     end
   end
 
-  after do
-    @generic_file.destroy
-  end
-
   subject { CharacterizeJob.new(@generic_file.id)}
 
   it 'spawns a CreateDerivatives job' do

data/spec/jobs/create_derivatives_job_spec.rb

@@ -4,10 +4,7 @@ describe CreateDerivativesJob do
   before do
     @ffmpeg_enabled = Sufia.config.enable_ffmpeg
     Sufia.config.enable_ffmpeg = true
-    @generic_file = GenericFile.new.tap do |gf|
-      gf.apply_depositor_metadata('jcoyne@example.com')
-      gf.save
-    end
+    @generic_file = GenericFile.create { |gf| gf.apply_depositor_metadata('jcoyne@example.com') }
   end
 
   after do
@@ -17,12 +14,14 @@ describe CreateDerivativesJob do
   subject { CreateDerivativesJob.new(@generic_file.id) }
 
   describe 'thumbnail generation' do
+    before do
+      @generic_file.add_file(File.open(fixture_path + '/' + file_name), path: 'content', original_name: file_name, mime_type: mime_type)
+      allow_any_instance_of(GenericFile).to receive(:mime_type).and_return(mime_type)
+      @generic_file.save!
+    end
     context 'with a video (.avi) file', unless: $in_travis do
-      before do
-        @generic_file.add_file(File.open(fixture_path + '/countdown.avi'), 'content', 'countdown.avi')
-        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('video/avi')
-        @generic_file.save!
-      end
+      let(:mime_type) { 'video/avi' }
+      let(:file_name) { 'countdown.avi' }
 
       it 'lacks a thumbnail' do
         expect(@generic_file.thumbnail).not_to have_content
@@ -37,11 +36,8 @@ describe CreateDerivativesJob do
     end
 
     context 'with an audio (.wav) file', unless: $in_travis do
-      before do
-        @generic_file.add_file(File.open(fixture_path + '/piano_note.wav'), 'content', 'piano_note.wav')
-        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('audio/wav')
-        @generic_file.save!
-      end
+      let(:mime_type) { 'audio/wav' }
+      let(:file_name) { 'piano_note.wav' }
 
       it 'lacks a thumbnail' do
         expect(@generic_file.thumbnail).not_to have_content
@@ -55,11 +51,8 @@ describe CreateDerivativesJob do
     end
 
     context 'with an image (.jp2) file' do
-      before do
-        @generic_file.add_file(File.open(fixture_path + '/image.jp2'), 'content', 'image.jp2')
-        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('image/jp2')
-        @generic_file.save!
-      end
+      let(:mime_type) { 'image/jp2' }
+      let(:file_name) { 'image.jp2' }
 
       it 'lacks a thumbnail' do
         expect(@generic_file.thumbnail).not_to have_content
@@ -74,11 +67,8 @@ describe CreateDerivativesJob do
     end
 
     context 'with an office document (.docx) file', unless: $in_travis do
-      before do
-        @generic_file.add_file(File.open(fixture_path + '/charter.docx'), 'content', 'charter.docx')
-        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('application/vnd.openxmlformats-officedocument.wordprocessingml.document')
-        @generic_file.save!
-      end
+      let(:mime_type) { 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' }
+      let(:file_name) { 'charter.docx' }
 
       it 'lacks a thumbnail' do
         expect(@generic_file.thumbnail).not_to have_content
@@ -94,12 +84,14 @@ describe CreateDerivativesJob do
   end
 
   describe 'audiovisual transcoding' do
+    before do
+      @generic_file.add_file(File.open(fixture_path + '/' + file_name), path: 'content', original_name: file_name, mime_type: mime_type)
+      allow_any_instance_of(GenericFile).to receive(:mime_type).and_return(mime_type)
+      @generic_file.save!
+    end
     context 'with a video (.avi) file', unless: $in_travis do
-      before do
-        @generic_file.add_file(File.open(fixture_path + '/countdown.avi'), 'content', 'countdown.avi')
-        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('video/avi')
-        @generic_file.save!
-      end
+      let(:mime_type) { 'video/avi' }
+      let(:file_name) { 'countdown.avi' }
 
       it 'transcodes to webm and mp4' do
         subject.run
@@ -117,11 +109,8 @@ describe CreateDerivativesJob do
     end
 
     context 'with an audio (.wav) file', unless: $in_travis do
-      before do
-        @generic_file.add_file(File.open(fixture_path + '/piano_note.wav'), 'content', 'piano_note.wav')
-        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('audio/wav')
-        @generic_file.save!
-      end
+      let(:mime_type) { 'audio/wav' }
+      let(:file_name) { 'piano_note.wav' }
 
       it 'transcodes to mp3 and ogg' do
         subject.run
@@ -145,8 +134,8 @@ describe CreateDerivativesJob do
       #   @generic_file.save!
       # end
 
-      it 'should copy the content to the mp3 datastream and transcode to ogg' do
-        pending 'Need a way to do this in hydra-derivatives'
+      #Need a way to do this in hydra-derivatives
+      it 'should copy the content to the mp3 datastream and transcode to ogg', skip: true do
         subject.run
         reloaded = @generic_file.reload
         derivative = reloaded.attached_files['mp3']
@@ -166,8 +155,8 @@ describe CreateDerivativesJob do
       #   @generic_file.save!
       # end
 
-      it 'should copy the content to the ogg datastream and transcode to mp3' do
-        pending 'Need a way to do this in hydra-derivatives'
+      #Need a way to do this in hydra-derivatives
+      it 'should copy the content to the ogg datastream and transcode to mp3', skip: true do
         subject.run
         reloaded = @generic_file.reload
         derivative = reloaded.attached_files['mp3']

data/spec/jobs/import_url_job_spec.rb

@@ -7,17 +7,17 @@ describe ImportUrlJob do
   let(:file_hash)  {'/673467823498723948237462429793840923582'}
 
   let(:generic_file) do
-    GenericFile.new.tap do |f|
+    GenericFile.create do |f|
       f.import_url = "http://example.org#{file_hash}"
       f.label = file_path
       f.apply_depositor_metadata(user.user_key)
-      f.save
     end
   end
 
   let(:mock_response) do
     double('response').tap do |http_res|
       allow(http_res).to receive(:start).and_yield
+      allow(http_res).to receive(:content_type).and_return('image/png')
       allow(http_res).to receive(:read_body).and_yield(File.open(File.expand_path('../../fixtures/world.png', __FILE__)).read)
     end
   end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -3,16 +3,14 @@ require 'spec_helper'
 describe IngestLocalFileJob do
   let(:user) { FactoryGirl.find_or_create(:jill) }
 
-  let (:generic_file) do
-    GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save }
-  end
+  let(:generic_file) { create :generic_file, depositor: user }
 
-  subject(:job) { IngestLocalFileJob.new(generic_file.id, @mock_upload_directory, "world.png", user.user_key) }
+  let(:job) { IngestLocalFileJob.new(generic_file.id, mock_upload_directory, "world.png", user.user_key) }
+  let(:mock_upload_directory) { 'spec/mock_upload_directory' }
 
   before do
-    @mock_upload_directory = 'spec/mock_upload_directory'
-    Dir.mkdir @mock_upload_directory unless File.exists? @mock_upload_directory
-    FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), @mock_upload_directory)
+    Dir.mkdir mock_upload_directory unless File.exists? mock_upload_directory
+    FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), mock_upload_directory)
   end
 
   it "should have attached a file" do
@@ -22,7 +20,7 @@ describe IngestLocalFileJob do
 
   describe "virus checking" do
     it "should run virus check" do
-      expect(Sufia::GenericFile::Actor).to receive(:virus_check).twice.and_return(0)
+      expect(Sufia::GenericFile::Actor).to receive(:virus_check).and_return(0)
       job.run
     end
     it "should abort if virus check fails" do

data/spec/lib/sufia/id_service_spec.rb

@@ -14,11 +14,6 @@ describe Sufia::IdService do
       expect(Sufia::IdService.valid?(subject)).to be true
     end
 
-    it "should be reversable" do
-      new_id = Sufia::IdService.mint
-      expect(Sufia::Noid.noidify(new_id)).to eq new_id
-    end
-
     context "when the pid already exists in Fedora" do
       let(:mock_pid) { 'ef12ef12f' }
       let(:unique_pid) { 'bb22bb22b' }
@@ -34,6 +29,4 @@ describe Sufia::IdService do
       end
     end
   end
-
-
 end

data/spec/lib/sufia/messages_spec.rb

@@ -16,10 +16,10 @@ describe Sufia::Messages do
     Object.send(:remove_const, :TestClass)
   end
 
-  let(:batch_id)  { "1" }
-  let(:single)    { double(noid: "1", to_s: "File 1") }
-  let(:multiple)  { [ double(noid: "1", to_s: "File 1"), double(noid: "2", to_s: "File 2"), double(noid: "3", to_s: "File 3") ] }
-  let(:file_list) { "<a href='/files/1'>File 1</a>, <a href='/files/2'>File 2</a>, <a href='/files/3'>File 3</a>"  }
+  let(:batch_id) { "1" }
+  let(:single) { double(to_param: "1", to_s: "File 1") }
+  let(:multiple) { [double(to_param: "1", to_s: "File 1"), double(to_param: "2", to_s: "File 2"), double(to_param: "3", to_s: "File 3")] }
+  let(:file_list) { "<a href='/files/1'>File 1</a>, <a href='/files/2'>File 2</a>, <a href='/files/3'>File 3</a>" }
 
   describe "message subjects" do
     it "should provide a subject for a success message" do
@@ -31,30 +31,34 @@ describe Sufia::Messages do
   end
 
   describe "#single_success" do
-    let(:expected) { '<span id="ss-1"><a href="/files/1">File 1</a> has been saved.</span>' }
     it "should render a success message for a single file" do
-      expect(message.single_success(batch_id, single)).to eq(expected)
+      node = Capybara::Node::Simple.new(message.single_success(batch_id, single))
+      expect(node).to have_selector("span[id=\"ss-1\"]", text:"File 1 has been saved.")
+      expect(node).to have_selector("a[href=\"/files/1\"]")
     end
   end
 
   describe "#multiple_success" do
-    let(:expected) { '<span id="ss-1"><a data-content="'+file_list+'" data-title="Files uploaded successfully" href="#" rel="popover">These files</a> have been saved.</span>' }
     it "should render a success message for multiple files" do
-      expect(message.multiple_success(batch_id, multiple)).to eq(expected)
+      node = Capybara::Node::Simple.new(message.multiple_success(batch_id, multiple))
+      expect(node).to have_selector("span[id=\"ss-1\"]", text:"These files have been saved.")
+      expect(node).to have_selector("a[data-content=\"#{file_list}\"][rel=\"popover\"][data-title=\"Files uploaded successfully\"]")
     end
   end
 
   describe "#single_failure" do
-    let(:expected) { '<span id="ss-1"><a href="/files/1">File 1</a> could not be updated. You do not have sufficient privileges to edit it.</span>' }
     it "should render a failure message for a single file" do
-      expect(message.single_failure(batch_id, single)).to eq(expected)
+      node = Capybara::Node::Simple.new(message.single_failure(batch_id, single))
+      expect(node).to have_selector("span[id=\"ss-1\"]", text:"File 1 could not be updated. You do not have sufficient privileges to edit it.")
+      expect(node).to have_selector("a[href=\"/files/1\"]")
     end
   end
 
   describe "#multiple_failure" do
-    let(:expected) { '<span id="ss-1"><a data-content="'+file_list+'" data-title="Files failed" href="#" rel="popover">These files</a> could not be updated. You do not have sufficient privileges to edit them.</span>' }
     it "should render a failure message for multiple files" do
-      expect(message.multiple_failure(batch_id, multiple)).to eq(expected)
+      node = Capybara::Node::Simple.new(message.multiple_failure(batch_id, multiple))
+      expect(node).to have_selector("span[id=\"ss-1\"]", text:"These files could not be updated. You do not have sufficient privileges to edit them.")
+      expect(node).to have_selector("a[data-content=\"#{file_list}\"][rel=\"popover\"][data-title=\"Files failed\"]")
     end
   end
 
@@ -63,5 +67,4 @@ describe Sufia::Messages do
       expect(message.file_list(multiple)).to eq(file_list)
     end
   end
-
 end

data/spec/models/ability_spec.rb

@@ -7,6 +7,7 @@ describe Sufia::Ability, :type => :model do
     subject { Ability.new(user) }
     it { is_expected.not_to be_able_to(:create, GenericFile) }
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
+    it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
   end
 
@@ -15,6 +16,7 @@ describe Sufia::Ability, :type => :model do
     subject { Ability.new(user) }
     it { is_expected.to be_able_to(:create, GenericFile) }
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
+    it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
   end
 
@@ -24,6 +26,7 @@ describe Sufia::Ability, :type => :model do
     subject { Ability.new(user) }
     it { is_expected.to be_able_to(:create, GenericFile) }
     it { is_expected.to be_able_to(:create, TinymceAsset) }
+    it { is_expected.to be_able_to(:create, ContentBlock) }
     it { is_expected.to be_able_to(:update, ContentBlock) }
   end
 

data/spec/models/checksum_audit_log_spec.rb

@@ -7,7 +7,7 @@ describe ChecksumAuditLog do
 
   let(:f) do
     GenericFile.create do |gf|
-      gf.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      gf.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
       gf.apply_depositor_metadata('mjg36')
     end
   end

data/spec/models/content_block_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe ContentBlock, :type => :model do
+
+  let(:bilbo) { ContentBlock.create!(
+    name: ContentBlock::RESEARCHER,
+    value: '<h1>Bilbo Baggins</h1>',
+    created_at: Time.now)
+  }
+
+  let(:frodo) { ContentBlock.create!(
+    name: ContentBlock::RESEARCHER,
+    value: '<h1>Frodo Baggins</h1>',
+    created_at: 2.hours.ago)
+  }
+
+  let(:marketing) { ContentBlock.create!(
+    name: ContentBlock::MARKETING,
+    value: '<h1>Marketing Text</h1>')
+  }
+
+  describe '.recent_researchers' do
+    before { frodo; bilbo; marketing }
+    subject { ContentBlock.recent_researchers }
+
+    it 'returns featured_researcher entries in chronological order' do
+      expect(ContentBlock.count).to eq 3
+      expect(subject).to eq [bilbo, frodo]
+    end
+  end
+
+  describe '.featured_researcher' do
+    before { frodo; bilbo; marketing }
+    subject { ContentBlock.featured_researcher }
+
+    it 'finds the most recent entry for featured_researcher' do
+      expect(subject).to eq bilbo
+    end
+  end
+
+end

data/spec/models/featured_work_list_spec.rb

@@ -1,32 +1,46 @@
 require 'spec_helper'
 
 describe FeaturedWorkList, :type => :model do
-  let(:file1) { FactoryGirl.create(:generic_file) }
-  let(:file2) { FactoryGirl.create(:generic_file) }
-
-  before do
-    FeaturedWork.create(generic_file_id: file1.noid)
-    FeaturedWork.create(generic_file_id: file2.noid)
-  end
+  let(:file1) { create(:generic_file) }
+  let(:file2) { create(:generic_file) }
 
   describe 'featured_works' do
+    before do
+      create(:featured_work, generic_file_id: file1.id)
+      create(:featured_work, generic_file_id: file2.id)
+    end
+
     it 'should be a list of the featured work objects, each with the generic_file\'s solr_doc' do
       expect(subject.featured_works.size).to eq 2
       solr_doc = subject.featured_works.first.generic_file_solr_document
       expect(solr_doc).to be_kind_of SolrDocument
-      expect(solr_doc.noid).to eq file1.noid
+      expect(solr_doc.id).to eq file1.id
     end
   end
 
   describe 'file deleted' do
     before do
+      create(:featured_work, generic_file_id: file1.id)
+      create(:featured_work, generic_file_id: file2.id)
       file1.destroy
     end
+
     it 'should be a list of the remaining featured work objects, each with the generic_file\'s solr_doc' do
       expect(subject.featured_works.size).to eq 1
       solr_doc = subject.featured_works.first.generic_file_solr_document
       expect(solr_doc).to be_kind_of SolrDocument
-      expect(solr_doc.noid).to eq file2.noid
+      expect(solr_doc.id).to eq file2.id
     end
   end
+
+  describe '#empty?' do
+    context "when there are featured works" do
+      before do
+        create(:featured_work, generic_file_id: file1.id)
+      end
+      it { is_expected.not_to be_empty }
+    end
+
+    it { is_expected.to be_empty }
+  end
 end

data/spec/models/file_content_datastream_spec.rb

@@ -4,7 +4,7 @@ describe FileContentDatastream, :type => :model do
   describe "#latest_version" do
     let(:file) do
       GenericFile.create do |f|
-        f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+        f.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
         f.apply_depositor_metadata('mjg36')
       end
     end
@@ -16,7 +16,7 @@ describe FileContentDatastream, :type => :model do
 
     context "with two versions" do
       before do
-        file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+        file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
         file.save
       end
       subject { file.content.latest_version.label }
@@ -44,13 +44,13 @@ describe FileContentDatastream, :type => :model do
     end
 
     it "should only return true when the datastream has actually changed" do
-      @generic_file.add_file(File.open(fixture_path + '/world.png', 'rb'), 'content', 'world.png')
+      @generic_file.add_file(File.open(fixture_path + '/world.png', 'rb'), path: 'content', original_name: 'world.png')
       expect(@generic_file.content).to be_changed
       @generic_file.save!
       expect(@generic_file.content).to_not be_changed
 
       # Add a thumbnail ds
-      @generic_file.add_file(File.open(fixture_path + '/world.png'), 'thumbnail', 'world.png')
+      @generic_file.add_file(File.open(fixture_path + '/world.png'), path: 'thumbnail', original_name: 'world.png')
       expect(@generic_file.thumbnail).to be_changed
       expect(@generic_file.content).to_not be_changed