sufia 6.2.0 → 6.3.0

data/spec/jobs/import_url_job_spec.rb

@@ -4,7 +4,7 @@ describe ImportUrlJob do
   let(:user) { FactoryGirl.find_or_create(:jill) }
 
   let(:file_path) { '/world.png' }
-  let(:file_hash)  {'/673467823498723948237462429793840923582'}
+  let(:file_hash) { '/673467823498723948237462429793840923582' }
 
   let(:generic_file) do
     GenericFile.create do |f|
@@ -22,9 +22,9 @@ describe ImportUrlJob do
     end
   end
 
-  subject(:job) { ImportUrlJob.new(generic_file.id) }
+  subject(:job) { described_class.new(generic_file.id) }
 
-  it "should have no content at the outset" do
+  it "has no content at the outset" do
     expect(generic_file.content.size).to be_nil
   end
 
@@ -41,7 +41,7 @@ describe ImportUrlJob do
       expect(Sufia::GenericFile::Actor).to receive(:virus_check).and_return(false)
     end
 
-    it "should create a content datastream" do
+    it "creates a content datastream" do
       expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
       job.run
       expect(generic_file.reload.content.size).to eq 4218
@@ -55,10 +55,41 @@ describe ImportUrlJob do
 
       allow(CharacterizeJob).to receive(:new).with(generic_file.id).never
     end
-    it "should abort if virus check fails" do
+    it "aborts if virus check fails" do
       allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
       job.run
       expect(user.mailbox.inbox.first.subject).to eq("File Import Error")
     end
   end
+
+  context "when a batch update job is running too" do
+    let(:title) { { generic_file.id => ['File One'] } }
+    let(:metadata) { {} }
+    let(:visibility) { nil }
+
+    let(:batch) { Batch.create }
+    let(:batch_job) { BatchUpdateJob.new(user.user_key, batch.id, title, metadata, visibility) }
+
+    before do
+      generic_file.batch = batch
+      generic_file.save
+      allow_any_instance_of(Ability).to receive(:can?).and_return(true)
+      expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
+    end
+
+    it "does not kill all the metadata set by other jobs" do
+      # load the object before running the batch job
+      gf = job.object
+
+      # runthe batch job to set the title
+      batch_job.run
+
+      # run the import job
+      job.run
+
+      # import job should not override the title set by the batch job
+      file = GenericFile.find(gf.id)
+      expect(file.title).to eq(['File One'])
+    end
+  end
 end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -1,32 +1,43 @@
 require 'spec_helper'
 
 describe IngestLocalFileJob do
-  let(:user) { FactoryGirl.find_or_create(:jill) }
+  context "with valid data to run" do
+    let(:user) { FactoryGirl.find_or_create(:jill) }
 
-  let(:generic_file) { create :generic_file, depositor: user }
+    let(:generic_file) { create :generic_file, depositor: user }
 
-  let(:job) { IngestLocalFileJob.new(generic_file.id, mock_upload_directory, "world.png", user.user_key) }
-  let(:mock_upload_directory) { 'spec/mock_upload_directory' }
+    let(:job) { described_class.new(generic_file.id, mock_upload_directory, "world.png", user.user_key) }
+    let(:mock_upload_directory) { 'spec/mock_upload_directory' }
 
-  before do
-    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
-    job.run
-    expect(generic_file.reload.content.size).to eq(4218)
-  end
+    before do
+      Dir.mkdir mock_upload_directory unless File.exist? mock_upload_directory
+      FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), mock_upload_directory)
+    end
 
-  describe "virus checking" do
-    it "should run virus check" do
-      expect(Sufia::GenericFile::Actor).to receive(:virus_check).and_return(0)
+    it "has attached a file" do
       job.run
+      expect(generic_file.reload.content.size).to eq(4218)
+      expect(File).not_to exist("#{mock_upload_directory}/world.png")
     end
-    it "should abort if virus check fails" do
-      allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
-      job.run
-      expect(user.mailbox.inbox.first.subject).to eq("Local file ingest error")
+
+    describe "virus checking" do
+      it "runs virus check" do
+        expect(Sufia::GenericFile::Actor).to receive(:virus_check).and_return(0)
+        job.run
+      end
+      it "aborts if virus check fails" do
+        allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+        job.run
+        expect(user.mailbox.inbox.first.subject).to eq("Local file ingest error")
+      end
+    end
+  end
+
+  context "empty job" do
+    let(:job) { described_class.new(nil, nil, nil, nil) }
+
+    it "has the correct queue name" do
+      expect(job.queue_name).to eq(:ingest)
     end
   end
 end

data/spec/jobs/sufia_resque_queue_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Sufia::Resque::Queue do
-  let(:subject) { Sufia::Resque::Queue.new "test_queue" }
+  let(:subject) { described_class.new "test_queue" }
   let(:job) { double('job') }
 
   context "with no retries" do

data/spec/lib/sufia/analytics_spec.rb

@@ -25,5 +25,4 @@ describe Sufia::Analytics do
   it 'responds to :profile' do
     expect(subject).to respond_to(:profile)
   end
-
 end

data/spec/lib/sufia/arkivo/actor_spec.rb

@@ -100,9 +100,9 @@ describe Sufia::Arkivo::Actor do
     end
 
     it 'changes the arkivo checksum' do
-      expect {
+      expect do
         subject.update_file_from_item(gf)
-      }.to change { gf.arkivo_checksum }.from(checksum).to(item['file']['md5'])
+      end.to change { gf.arkivo_checksum }.from(checksum).to(item['file']['md5'])
     end
 
     it 'calls update_content' do
@@ -111,9 +111,9 @@ describe Sufia::Arkivo::Actor do
     end
 
     it 'extracts a file from the item' do
-      expect {
+      expect do
         subject.update_file_from_item(gf)
-      }.to change { gf.content.content }.to("# HEADER\n\nThis is a paragraph!\n")
+      end.to change { gf.content.content }.to("# HEADER\n\nThis is a paragraph!\n")
     end
 
     it 'returns a GF instance' do
@@ -131,9 +131,9 @@ describe Sufia::Arkivo::Actor do
     it { is_expected.to respond_to(:destroy_file) }
 
     it 'deletes the file' do
-      expect {
+      expect do
         subject.destroy_file(gf)
-      }.to change { gf.destroyed? }.from(nil).to(true)
+      end.to change { gf.destroyed? }.from(nil).to(true)
     end
   end
 end

data/spec/lib/sufia/arkivo/schema_validator_spec.rb

@@ -4,62 +4,62 @@ describe Sufia::Arkivo::SchemaValidator do
   let(:item) { JSON.parse(FactoryGirl.json(:post_item)) }
 
   it 'ensures a token is included' do
-    expect {
+    expect do
       described_class.new(item.except('token')).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'token'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'token'/)
   end
 
   it 'ensures a metadata section is included' do
-    expect {
+    expect do
       described_class.new(item.except('metadata')).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'metadata'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'metadata'/)
   end
 
   it 'ensures a file section is included' do
-    expect {
+    expect do
       described_class.new(item.except('file')).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'file'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'file'/)
   end
 
   it 'ensures the metadata has a title' do
     item['metadata'].delete('title')
-    expect {
+    expect do
       described_class.new(item).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'title'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'title'/)
   end
 
   it 'ensures the metadata has rights' do
     item['metadata'].delete('rights')
-    expect {
+    expect do
       described_class.new(item).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'rights'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'rights'/)
   end
 
   it 'ensures the file has a b64-encoded content' do
     item['file'].delete('base64')
-    expect {
+    expect do
       described_class.new(item).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'base64'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'base64'/)
   end
 
   it 'ensures the file has a checksum' do
     item['file'].delete('md5')
-    expect {
+    expect do
       described_class.new(item).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'md5'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'md5'/)
   end
 
   it 'ensures the file has a filename' do
     item['file'].delete('filename')
-    expect {
+    expect do
       described_class.new(item).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'filename'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'filename'/)
   end
 
   it 'ensures the file has a content type' do
     item['file'].delete('contentType')
-    expect {
+    expect do
       described_class.new(item).call
-    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'contentType'/)
+    end.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'contentType'/)
   end
 end

data/spec/lib/sufia/breadcrumbs_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::Breadcrumbs do  
-
+describe Sufia::Breadcrumbs do
   let(:crumbs) do
     TestClass.new
   end
@@ -18,7 +17,8 @@ describe Sufia::Breadcrumbs do
         @trail = []
         @request = true # avoids the allow_message_expectations_on_nil warning
       end
-      def add_breadcrumb text, link
+
+      def add_breadcrumb(text, link)
         @trail << [text, link]
       end
     end
@@ -85,7 +85,7 @@ describe Sufia::Breadcrumbs do
         allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
         allow(crumbs).to receive(:user_signed_in?) { true }
         allow(crumbs).to receive(:action_name).and_return("edit")
-        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
+        allow(crumbs).to receive(:params).and_return("id" => "abc123")
         allow(crumbs).to receive(:controller_name).and_return("generic_files")
       end
 
@@ -102,7 +102,7 @@ describe Sufia::Breadcrumbs do
         allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
         allow(crumbs).to receive(:user_signed_in?) { true }
         allow(crumbs).to receive(:action_name).and_return("stats")
-        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
+        allow(crumbs).to receive(:params).and_return("id" => "abc123")
         allow(crumbs).to receive(:controller_name).and_return("generic_files")
       end
 
@@ -114,5 +114,4 @@ describe Sufia::Breadcrumbs do
       end
     end
   end
-
 end

data/spec/lib/sufia/messages_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Sufia::Messages do
-
   let(:message) do
     TestClass.new
   end
@@ -22,48 +21,48 @@ describe Sufia::Messages do
   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
+    it "provides a subject for a success message" do
       expect(message.success_subject).to eq("Batch upload complete")
     end
-    it "should provide a subject for a failure message" do
+    it "provides a subject for a failure message" do
       expect(message.failure_subject).to eq("Batch upload permission denied")
     end
   end
 
   describe "#single_success" do
-    it "should render a success message for a single file" do
+    it "renders a success message for a single file" do
       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("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
-    it "should render a success message for multiple files" do
+    it "renders a success message for multiple files" do
       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("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
-    it "should render a failure message for a single file" do
+    it "renders a failure message for a single file" do
       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("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
-    it "should render a failure message for multiple files" do
+    it "renders a failure message for multiple files" do
       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("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
 
   describe "#file_list" do
-    it "should replace double-quotes with single quotes" do
+    it "replaces double-quotes with single quotes" do
       expect(message.file_list(multiple)).to eq(file_list)
     end
   end

data/spec/lib/sufia/readable_permissions_spec.rb

@@ -1,30 +1,29 @@
 require 'spec_helper'
 
 describe Sufia::Permissions::Readable do
-
   class SubjectClass
     include Sufia::Permissions::Readable
-    attr_accessor :read_groups 
+    attr_accessor :read_groups
   end
   let(:subject) { SubjectClass.new }
 
   describe "#public?" do
-    it "should return true for public items" do
-      subject.read_groups = ["public","othergroup"]
+    it "returns true for public items" do
+      subject.read_groups = ["public", "othergroup"]
       expect(subject).to be_public
     end
-    it "should return fale for non-public items" do
-      subject.read_groups = ["notpublic","othergroup"]
+    it "returns fale for non-public items" do
+      subject.read_groups = ["notpublic", "othergroup"]
       expect(subject).to_not be_public
     end
   end
 
   describe "#registered?" do
-    it "should return true for registered items" do
-      subject.read_groups = ["registered","othergroup"]
+    it "returns true for registered items" do
+      subject.read_groups = ["registered", "othergroup"]
       expect(subject).to be_registered
     end
-    it "should return fale for non-registered items" do
+    it "returns fale for non-registered items" do
       subject.read_groups = ["othergroup"]
       expect(subject).to_not be_registered
     end
@@ -52,5 +51,4 @@ describe Sufia::Permissions::Readable do
       end
     end
   end
-
 end

data/spec/lib/sufia/upload_complete_behavior_spec.rb

@@ -5,18 +5,17 @@ end
 
 class UploadThingRedefine
   extend Sufia::FilesController::UploadCompleteBehavior
-  def self.upload_complete_path(id)
-    return "example.com"
+  def self.upload_complete_path(_id)
+    "example.com"
   end
 
-  def self.destroy_complete_path(id)
-    return "destroy.com"
+  def self.destroy_complete_path(_id)
+    "destroy.com"
   end
-
 end
 
 describe Sufia::FilesController::UploadCompleteBehavior do
-  let(:test_id) {"123abc"}
+  let(:test_id) { "123abc" }
   context "Not overridden" do
     it "respond with the batch edit path" do
       expect(UploadThing.upload_complete_path(test_id)).to eq(Sufia::Engine.routes.url_helpers.batch_edit_path(test_id))
@@ -33,4 +32,4 @@ describe Sufia::FilesController::UploadCompleteBehavior do
       expect(UploadThingRedefine.destroy_complete_path(test_id)).to eq("destroy.com")
     end
   end
-end
+end