sufia 5.0.0 → 6.0.0.beta1

data/spec/features/ingest_upload_files_spec.rb

@@ -13,12 +13,14 @@ describe "Uploading files via web form", :type => :feature do
     expect(page).to have_xpath '//input[@type="file"]'
   end
 
-  it "should require checking the terms of service" do
-    attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/image.jp2")
-    attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/jp2_fits.xml")
-    expect(page).to have_css("button#main_upload_start[disabled]")
-    find('#main_upload_start_span').hover do
-      expect(page).to have_content "Please accept Deposit Agreement before you can upload."
+  context "the terms of service", :js do
+    it "should be required to be checked" do
+      attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/image.jp2")
+      attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/jp2_fits.xml")
+      expect(page).to have_css("button#main_upload_start[disabled]")
+      find('#main_upload_start_span').hover do
+        expect(page).to have_content "Please accept Deposit Agreement before you can upload."
+      end
     end
   end
 end

data/spec/features/ownership_transfer_spec.rb

@@ -24,11 +24,7 @@ describe 'Transferring file ownership:', :type => :feature do
     go_to_dashboard_files
   end
 
-  after do
-    ActiveFedora::Base.destroy_all
-  end
-
-  describe 'When I request a file transfer:' do
+  describe 'When I request a file transfer:', :js do
     context 'For a file I do not own' do
       pending 'The transfer option is not available' do
         fail
@@ -70,7 +66,7 @@ describe 'Transferring file ownership:', :type => :feature do
     end
   end
 
-  describe 'When someone requests a file transfer to me' do
+  describe 'When someone requests a file transfer to me', :js do
     before do
       # As the original_owner, transfer a file to the new_owner
       transfer_ownership_of_file file, new_owner

data/spec/features/proxy_spec.rb

@@ -4,7 +4,7 @@ describe 'proxy', :type => :feature do
   let(:user) { FactoryGirl.find_or_create(:archivist) }
   let(:second_user) { FactoryGirl.find_or_create(:jill) }
 
-  describe 'add proxy in profile' do
+  describe 'add proxy in profile', :js do
     it "creates a proxy" do
       sign_in user
       visit "/"

data/spec/features/search_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-describe 'searching', :type => :feature do
-  before { GenericFile.destroy_all }
-  let!(:file) { FactoryGirl.create(:public_file, title: "Toothbrush") }
+describe 'searching' do
+  let!(:file) { FactoryGirl.create(:public_file, title: ["Toothbrush"]) }
 
   context "as a public user" do
     it "should find the file and have a gallery" do

data/spec/features/single_use_links_spec.rb

@@ -40,7 +40,7 @@ describe "Create and use single-use links", :type => :feature do
       visit generate_download_single_use_link_path(id: file)
       expect(page).to have_css '.download-link'
       find('.download-link').click
-      expected_content = ActiveFedora::Base.find(file.pid, cast: true).content.content
+      expected_content = ActiveFedora::Base.find(file.id).content.content
       expect(page.source).to eq expected_content
     end
   end

data/spec/features/users_spec.rb

@@ -30,7 +30,7 @@ describe "User Profile", :type => :feature do
       click_button 'Save Profile'
       expect(page).to have_content 'Your profile has been updated'
       click_link 'Profile'
-      expect(page).to have_link('curatorOfData', href: 'http://twitter.com/curatorOfData')
+      expect(page).to have_content 'http://twitter.com/curatorOfData'
     end
   end
 

data/spec/helpers/records_helper_spec.rb

@@ -1,6 +1,24 @@
 require 'spec_helper'
 
-describe RecordsHelper, :type => :helper do
+describe RecordsHelper do
+
+  describe "#add_field" do
+    let(:expected) {
+      "<span class=\"input-group-btn field-controls\"><button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-plus\"></i></span><span class=\"sr-only\">add another test</span></button></span>"
+    }
+
+    subject { helper.add_field(:test) }
+    it { is_expected.to eq expected }
+  end
+
+  describe "#subtract_field" do
+    let(:expected) {
+      "<span class=\"input-group-btn field-controls\"><button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-remove\"></i></span><span class=\"sr-only\">add another test</span></button></span>"
+    }
+
+    subject { helper.subtract_field(:test) }
+    it { is_expected.to eq expected }
+  end
 
   it "draws help_icon" do
     str = String.new(helper.help_icon(:tag))
@@ -24,15 +42,13 @@ describe RecordsHelper, :type => :helper do
 
   describe "download links" do
 
-    before :all do
-      @file = GenericFile.new(pid: "fake:1")
-      assign :generic_file, @file
-    end
-
+    let(:file) { GenericFile.new(id: "fake-1") }
     let(:link_text) { helper.render_download_link("Download Fake") }
     let(:icon_text) { helper.render_download_icon("Download the full-sized Fake") }
- 
-    describe "#render_download_link" do    
+
+    before { assign :generic_file, file }
+
+    describe "#render_download_link" do
       it "has default text" do
         expect(helper.render_download_link).to have_selector("#file_download")
         expect(helper.render_download_link).to have_content("Download")
@@ -55,7 +71,6 @@ describe RecordsHelper, :type => :helper do
         expect(icon_text).to match("Download the full-sized Fake")
       end
     end
-
   end
 
   describe "#metadata_help" do
@@ -84,5 +99,4 @@ describe RecordsHelper, :type => :helper do
       expect(helper.get_aria_label("tag")).to eql("Usage information for keyword")
     end
   end
-
 end

data/spec/jobs/active_fedora_pid_based_job_spec.rb

@@ -6,13 +6,9 @@ describe ActiveFedoraPidBasedJob do
                   gf.apply_depositor_metadata(user)
                   gf.save!
                 end}
-  after do
-    file.destroy
-    user.destroy
-  end
+
   it "finds object" do
     job = ActiveFedoraPidBasedJob.new(file.id)
     expect(job.generic_file).to_not be_nil
-    expect(job.generic_file).to be_reload_on_save
   end
 end

data/spec/jobs/audit_job_spec.rb

@@ -1,31 +1,76 @@
 require 'spec_helper'
 
 describe AuditJob do
-  before do
-    @user = FactoryGirl.find_or_create(:jill)
-    @inbox = @user.mailbox.inbox
-    @file = GenericFile.new
-    @file.apply_depositor_metadata(@user)
-    @file.save
+  let(:user) { FactoryGirl.create(:user) }
+
+  let(:file) do
+    GenericFile.create do |file|
+      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      file.apply_depositor_metadata(user)
+    end
+  end
+
+  let(:job) { AuditJob.new(file.id, 'content', uri) }
+
+  describe "audit on content" do
+    let(:uri) { file.content.uri }
+    it "should pass" do
+      expect(job.run).to eq(true)
+    end
   end
-  after do
-    @file.delete
+
+  describe "audit on a version of the content" do
+    let(:uri) { file.content.versions.first.uri }
+    it "should pass" do
+      expect(job.run).to eq(true)
+    end
+  end
+
+  describe "audit on an invalid version of the content" do
+    let(:uri) { file.content.versions.first.uri + "bogus" }
+    it "should fail" do
+      expect(job.run).to eq(false)
+    end
   end
-  describe "passing audit" do
-    it "should not send passing mail" do
-      allow_any_instance_of(ActiveFedora::RelsExtDatastream).to receive(:dsChecksumValid).and_return(true)
-      AuditJob.new(@file.pid, "RELS-EXT", @file.rels_ext.versionID).run
-      @inbox = @user.mailbox.inbox
-      expect(@inbox.count).to eq(0)
+
+  describe "sending mail" do
+    let(:uri) { file.content.uri }
+    let(:inbox) { user.mailbox.inbox }
+
+    before do
+      allow_any_instance_of(ActiveFedora::FixityService).to receive(:check).and_return(result)
+      job.run
+    end
+
+    context "when the audit passes" do
+      let(:result) { true }
+      it "should not send mail" do
+        expect(inbox.count).to eq(0)
+      end
+    end
+    context "when the audit fails" do
+      let(:result) { false }
+      it "should send failing mail" do
+        expect(inbox.count).to eq(1)
+        inbox.each { |msg| expect(msg.last_message.subject).to eq(AuditJob::FAIL) }
+      end
     end
   end
-  describe "failing audit" do
-    it "should send failing mail" do
-      allow_any_instance_of(ActiveFedora::RelsExtDatastream).to receive(:dsChecksumValid).and_return(false)
-      AuditJob.new(@file.pid, "RELS-EXT", @file.rels_ext.versionID).run
-      @inbox = @user.mailbox.inbox
-      expect(@inbox.count).to eq(1)
-      @inbox.each { |msg| expect(msg.last_message.subject).to eq(AuditJob::FAIL) }
+
+  describe "run_audit" do
+    let(:uri) { file.content.versions.first.uri }
+    let!(:old) { ChecksumAuditLog.create(pid: file.id, dsid: 'content', version: uri, pass: 1, created_at: 2.minutes.ago) }
+    let!(:new) { ChecksumAuditLog.create(pid: file.id, dsid: 'content', version: uri, pass: 0) }
+    let(:mock_service) { double('mock fixity check service') }
+
+    before do
+      allow(ActiveFedora::FixityService).to receive(:new).and_return(mock_service)
+      allow(mock_service).to receive(:check).and_return(true, false, false, true, false)
+    end
+
+    it "should not prune failed audits" do
+      5.times { job.send(:run_audit) }
+      expect(ChecksumAuditLog.logs_for(file.id, 'content').map(&:pass)).to eq [0, 1, 0, 0, 1, 0, 1]
     end
   end
 end

data/spec/jobs/batch_update_job_spec.rb

@@ -1,61 +1,74 @@
 require 'spec_helper'
 
 describe BatchUpdateJob do
-  
-  before do
-    @user = FactoryGirl.find_or_create(:jill)
-    @batch = Batch.new
-    @batch.save
-    @file = GenericFile.new(batch: @batch)
-    @file.apply_depositor_metadata(@user)
-    @file.save
-    @file2 = GenericFile.new(batch: @batch)
-    @file2.apply_depositor_metadata('otherUser')
-    @file2.save
+
+  let(:user) { FactoryGirl.find_or_create(:jill) }
+  let(:batch) { Batch.create }
+
+  let!(:file) do
+    GenericFile.new(batch: batch) do |file|
+      file.apply_depositor_metadata(user)
+      file.save!
+    end
   end
-  
-  after do
-    @user.mailbox.inbox[0].messages[0].move_to_trash @user
-    @batch.delete
-    @file.delete
-    @file2.delete
+
+  let!(:file2) do
+    GenericFile.new(batch: batch) do |file|
+      file.apply_depositor_metadata(user)
+      file.save!
+    end
   end
-  
+
   describe "#run" do
     let(:params) do
       {
         generic_file: {
-          read_groups_string: '', read_users_string: 'archivist1, archivist2', tag: ['']
-        }, 
-        id: @batch.pid,
+          read_groups_string: '', read_users_string: 'archivist1, archivist2',
+          tag: ['']
+        },
+        title: { file.id => ['File One'], file2.id => ['File Two'] },
+        id: batch.id,
         controller: 'batch',
         action: 'update'
       }.with_indifferent_access
     end
+
     context "with a failing update" do
       it "should check permissions for each file before updating" do
-        expect_any_instance_of(User).to receive(:can?).with(:edit, @file).and_return(false)
-        expect_any_instance_of(User).to receive(:can?).with(:edit, @file2).and_return(false)
-        BatchUpdateJob.new(@user.user_key, params).run
-        expect(@user.mailbox.inbox[0].messages[0].subject).to eq("Batch upload permission denied")
-        expect(@user.mailbox.inbox[0].messages[0].body).to include("data-content")
-        expect(@user.mailbox.inbox[0].messages[0].body).to include("These files")
+        expect_any_instance_of(User).to receive(:can?).with(:edit, file).and_return(false)
+        expect_any_instance_of(User).to receive(:can?).with(:edit, file2).and_return(false)
+        BatchUpdateJob.new(user.user_key, params).run
+        expect(user.mailbox.inbox[0].messages[0].subject).to eq("Batch upload permission denied")
+        expect(user.mailbox.inbox[0].messages[0].body).to include("data-content")
+        expect(user.mailbox.inbox[0].messages[0].body).to include("These files")
       end
     end
-    context "with a passing update" do
+
+    describe "sends events" do
       let(:s1) { double('one') }
       let(:s2) { double('two') }
       it "should log a content update event" do
-        expect_any_instance_of(User).to receive(:can?).with(:edit, @file).and_return(true)
-        expect_any_instance_of(User).to receive(:can?).with(:edit, @file2).and_return(true)
-        expect(ContentUpdateEventJob).to receive(:new).with(@file.pid, @user.user_key).and_return(s1)
+        expect_any_instance_of(User).to receive(:can?).with(:edit, file).and_return(true)
+        expect_any_instance_of(User).to receive(:can?).with(:edit, file2).and_return(true)
+        expect(ContentUpdateEventJob).to receive(:new).with(file.id, user.user_key).and_return(s1)
         expect(Sufia.queue).to receive(:push).with(s1).once
-        expect(ContentUpdateEventJob).to receive(:new).with(@file2.pid, @user.user_key).and_return(s2)
+        expect(ContentUpdateEventJob).to receive(:new).with(file2.id, user.user_key).and_return(s2)
         expect(Sufia.queue).to receive(:push).with(s2).once
-        BatchUpdateJob.new(@user.user_key, params).run
-        expect(@user.mailbox.inbox[0].messages[0].subject).to eq("Batch upload complete")
-        expect(@user.mailbox.inbox[0].messages[0].body).to include("data-content")
-        expect(@user.mailbox.inbox[0].messages[0].body).to include("These files")
+        BatchUpdateJob.new(user.user_key, params).run
+        expect(user.mailbox.inbox[0].messages[0].subject).to eq("Batch upload complete")
+        expect(user.mailbox.inbox[0].messages[0].body).to include("data-content")
+        expect(user.mailbox.inbox[0].messages[0].body).to include("These files")
+      end
+    end
+
+    describe "updates metadata" do
+      before do
+        allow(Sufia.queue).to receive(:push)
+        BatchUpdateJob.new(user.user_key, params).run
+      end
+
+      it "should update the titles" do
+        expect(file.reload.title).to eq ['File One']
       end
     end
   end

data/spec/jobs/content_depositor_change_event_job_spec.rb

@@ -8,11 +8,9 @@ describe ContentDepositorChangeEventJob do
       gf.apply_depositor_metadata(@depositor.user_key)
       gf.save!
     end
-    ContentDepositorChangeEventJob.new(@file.pid, @receiver.user_key).run
-  end
-  after do
-    @file.destroy
+    ContentDepositorChangeEventJob.new(@file.id, @receiver.user_key).run
   end
+
   it "changes the depositor and records an original depositor" do
     @file.reload
     expect(@file.depositor).to eq @receiver.user_key

data/spec/jobs/create_derivatives_job_spec.rb

@@ -12,7 +12,6 @@ describe CreateDerivativesJob do
 
   after do
     Sufia.config.enable_ffmpeg = @ffmpeg_enabled
-    @generic_file.destroy
   end
 
   subject { CreateDerivativesJob.new(@generic_file.id) }
@@ -33,7 +32,7 @@ describe CreateDerivativesJob do
         subject.run
         @generic_file.reload
         expect(@generic_file.thumbnail).to have_content
-        expect(@generic_file.thumbnail.mimeType).to eq('image/jpeg')
+        expect(@generic_file.thumbnail.mime_type).to eq('image/jpeg')
       end
     end
 
@@ -70,7 +69,7 @@ describe CreateDerivativesJob do
         subject.run
         @generic_file.reload
         expect(@generic_file.thumbnail).to have_content
-        expect(@generic_file.thumbnail.mimeType).to eq('image/jpeg')
+        expect(@generic_file.thumbnail.mime_type).to eq('image/jpeg')
       end
     end
 
@@ -89,7 +88,7 @@ describe CreateDerivativesJob do
         subject.run
         @generic_file.reload
         expect(@generic_file.thumbnail).to have_content
-        expect(@generic_file.thumbnail.mimeType).to eq('image/jpeg')
+        expect(@generic_file.thumbnail.mime_type).to eq('image/jpeg')
       end
     end
   end
@@ -105,15 +104,15 @@ describe CreateDerivativesJob do
       it 'transcodes to webm and mp4' do
         subject.run
         reloaded = @generic_file.reload
-        derivative = reloaded.datastreams['webm']
+        derivative = reloaded.attached_files['webm']
         expect(derivative).not_to be_nil
         expect(derivative.content).not_to be_nil
-        expect(derivative.mimeType).to eq('video/webm')
+        expect(derivative.mime_type).to eq('video/webm')
 
-        derivative2 = reloaded.datastreams['mp4']
+        derivative2 = reloaded.attached_files['mp4']
         expect(derivative2).not_to be_nil
         expect(derivative2.content).not_to be_nil
-        expect(derivative2.mimeType).to eq('video/mp4')
+        expect(derivative2.mime_type).to eq('video/mp4')
       end
     end
 
@@ -127,15 +126,15 @@ describe CreateDerivativesJob do
       it 'transcodes to mp3 and ogg' do
         subject.run
         reloaded = @generic_file.reload
-        derivative = reloaded.datastreams['mp3']
+        derivative = reloaded.attached_files['mp3']
         expect(derivative).not_to be_nil
         expect(derivative.content).not_to be_nil
-        expect(derivative.mimeType).to eq('audio/mpeg')
+        expect(derivative.mime_type).to eq('audio/mpeg')
 
-        derivative2 = reloaded.datastreams['ogg']
+        derivative2 = reloaded.attached_files['ogg']
         expect(derivative2).not_to be_nil
         expect(derivative2.content).not_to be_nil
-        expect(derivative2.mimeType).to eq('audio/ogg')
+        expect(derivative2.mime_type).to eq('audio/ogg')
       end
     end
 
@@ -150,13 +149,13 @@ describe CreateDerivativesJob do
         pending 'Need a way to do this in hydra-derivatives'
         subject.run
         reloaded = @generic_file.reload
-        derivative = reloaded.datastreams['mp3']
+        derivative = reloaded.attached_files['mp3']
         expect(derivative.content.size).to eq(reloaded.content.content.size)
-        expect(derivative.mimeType).to eq('audio/mpeg')
+        expect(derivative.mime_type).to eq('audio/mpeg')
 
-        derivative2 = reloaded.datastreams['ogg']
+        derivative2 = reloaded.attached_files['ogg']
         expect(derivative2.content).not_to be_nil
-        expect(derivative2.mimeType).to eq('audio/ogg')
+        expect(derivative2.mime_type).to eq('audio/ogg')
       end
     end
 
@@ -171,15 +170,15 @@ describe CreateDerivativesJob do
         pending 'Need a way to do this in hydra-derivatives'
         subject.run
         reloaded = @generic_file.reload
-        derivative = reloaded.datastreams['mp3']
+        derivative = reloaded.attached_files['mp3']
         expect(derivative).not_to be_nil
         expect(derivative.content).not_to be_nil
         expect(derivative.mimeType).to eq('audio/mpeg')
 
-        derivative2 = reloaded.datastreams['ogg']
+        derivative2 = reloaded.attached_files['ogg']
         expect(derivative2).not_to be_nil
         expect(derivative2.content.size).to eq(reloaded.content.content.size)
-        expect(derivative2.mimeType).to eq('audio/ogg')
+        expect(derivative2.mime_type).to eq('audio/ogg')
       end
     end
   end