sufia 4.0.1 → 4.1.0

data/spec/models/ability_spec.rb

@@ -1,31 +1,75 @@
 require 'spec_helper'
 require 'cancan/matchers'
 
-describe Sufia::Ability do
-
-
+describe Sufia::Ability, :type => :model do
   describe "a user with no roles" do
     let(:user) { nil }
     subject { Ability.new(user) }
-    it { should_not be_able_to(:create, GenericFile) }
-    it { should_not be_able_to(:create, TinymceAsset) }
-    it { should_not be_able_to(:update, ContentBlock) }
+    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(:update, ContentBlock) }
   end
 
   describe "a registered user" do
-    let(:user) { FactoryGirl.create(:user) }
+    let(:user) { FactoryGirl.find_or_create(:archivist) }
     subject { Ability.new(user) }
-    it { should be_able_to(:create, GenericFile) }
-    it { should_not be_able_to(:create, TinymceAsset) }
-    it { should_not be_able_to(:update, ContentBlock) }
+    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(:update, ContentBlock) }
   end
 
   describe "a user in the admin group" do
-    let(:user) { FactoryGirl.create(:user) }
-    before { user.stub(groups: ['admin', 'registered']) }
+    let(:user) { FactoryGirl.find_or_create(:archivist) }
+    before { allow(user).to receive_messages(groups: ['admin', 'registered']) }
+    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(:update, ContentBlock) }
+  end
+
+  describe "proxies and transfers" do
+    let(:sender) { FactoryGirl.find_or_create(:jill) }
+    let(:user) { FactoryGirl.find_or_create(:archivist) }
+    let(:file) do
+      GenericFile.new.tap do|file|
+        file.apply_depositor_metadata(sender.user_key)
+        file.save!
+      end
+    end
     subject { Ability.new(user) }
-    it { should be_able_to(:create, GenericFile) }
-    it { should be_able_to(:create, TinymceAsset) }
-    it { should be_able_to(:update, ContentBlock) }
+    it { is_expected.not_to be_able_to(:transfer, file.pid) }
+
+    context "with a ProxyDepositRequest for a file they have deposited" do
+      subject { Ability.new(sender) }
+      it { is_expected.to be_able_to(:transfer, file.pid) }
+    end
+
+    context "with a ProxyDepositRequest that they receive" do
+      let(:request) { ProxyDepositRequest.create!(pid: file.pid, receiving_user: user, sending_user: sender) }
+      it { is_expected.to be_able_to(:accept, request) }
+      it { is_expected.to be_able_to(:reject, request) }
+      it { is_expected.not_to be_able_to(:destroy, request) }
+
+      context "and the request has already been accepted" do
+        let(:request) { ProxyDepositRequest.create!(pid: file.pid, receiving_user: user, sending_user: sender, status: 'accepted') }
+        it { is_expected.not_to be_able_to(:accept, request) }
+        it { is_expected.not_to be_able_to(:reject, request) }
+        it { is_expected.not_to be_able_to(:destroy, request) }
+      end
+    end
+
+    context "with a ProxyDepositRequest they are the sender of" do
+      let(:request) { ProxyDepositRequest.create!(pid: file.pid, receiving_user: sender, sending_user: user) }
+      it { is_expected.not_to be_able_to(:accept, request) }
+      it { is_expected.not_to be_able_to(:reject, request) }
+      it { is_expected.to be_able_to(:destroy, request) }
+
+      context "and the request has already been accepted" do
+        let(:request) { ProxyDepositRequest.create!(pid: file.pid, receiving_user: sender, sending_user: user, status: 'accepted') }
+        it { is_expected.not_to be_able_to(:accept, request) }
+        it { is_expected.not_to be_able_to(:reject, request) }
+        it { is_expected.not_to be_able_to(:destroy, request) }
+      end
+    end
   end
 end

data/spec/models/batch_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Batch do
+describe Batch, :type => :model do
   before(:all) do
     @user = FactoryGirl.find_or_create(:jill)
     @file = GenericFile.new
@@ -16,22 +16,22 @@ describe Batch do
     @batch.delete
   end
   it "should have rightsMetadata" do
-    @batch.rightsMetadata.should be_instance_of Hydra::Datastream::RightsMetadata
+    expect(@batch.rightsMetadata).to be_instance_of Hydra::Datastream::RightsMetadata
   end
   it "should have dc desc metadata" do
-    @batch.descMetadata.should be_kind_of BatchRdfDatastream
+    expect(@batch.descMetadata).to be_kind_of BatchRdfDatastream
   end
   it "should belong to testuser" do
-    @batch.creator.should == [@user.user_key]
+    expect(@batch.creator).to eq([@user.user_key])
   end
   it "should be titled 'test collection'" do
-    @batch.title.should == ["test collection"]
+    expect(@batch.title).to eq(["test collection"])
   end
   it "should have generic_files defined" do
-    @batch.should respond_to(:generic_files)
+    expect(@batch).to respond_to(:generic_files)
   end
   it "should contain one generic file" do
-    @batch.part.should == [@file.pid]
+    expect(@batch.part).to eq([@file.pid])
   end
   it "should be able to have more than one file" do
     gf = GenericFile.new
@@ -39,28 +39,28 @@ describe Batch do
     gf.save
     @batch.part << gf.pid
     @batch.save
-    @batch.part.should == [@file.pid, gf.pid]
+    expect(@batch.part).to eq([@file.pid, gf.pid])
     gf.delete
   end
   it "should support to_solr" do
-    @batch.to_solr.should_not be_nil
-    @batch.to_solr["batch__part_t"].should be_nil
-    @batch.to_solr["batch__title_t"].should be_nil
-    @batch.to_solr["batch__creator_t"].should be_nil
+    expect(@batch.to_solr).not_to be_nil
+    expect(@batch.to_solr["batch__part_t"]).to be_nil
+    expect(@batch.to_solr["batch__title_t"]).to be_nil
+    expect(@batch.to_solr["batch__creator_t"]).to be_nil
   end
   describe "find_or_create" do
     describe "when the object exists" do
       it "should find batch instead of creating" do
-        Batch.should_receive(:create).never
+        expect(Batch).to receive(:create).never
         @b2 = Batch.find_or_create( @batch.pid)
       end
     end
     describe "when the object does not exist" do
       it "should create" do
-        lambda {Batch.find("batch:123")}.should raise_error(ActiveFedora::ObjectNotFoundError)
-        Batch.should_receive(:create).once.and_return("the batch")
+        expect {Batch.find("batch:123")}.to raise_error(ActiveFedora::ObjectNotFoundError)
+        expect(Batch).to receive(:create).once.and_return("the batch")
         @b2 = Batch.find_or_create( "batch:123")
-        @b2.should == "the batch"
+        expect(@b2).to eq("the batch")
       end
     end
   end

data/spec/models/characterization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::GenericFile::Characterization do
+describe Sufia::GenericFile::Characterization, :type => :model do
   before do
     class TestClass < ActiveFedora::Base
       include Sufia::GenericFile::Characterization

data/spec/models/checksum_audit_log_spec.rb

@@ -1,35 +1,43 @@
 require 'spec_helper'
 
-describe ChecksumAuditLog do
-  before(:all) do
-    @f = GenericFile.new
-    @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @f.apply_depositor_metadata('mjg36')
-    @f.save!
-    @version = @f.datastreams['content'].versions.first
-    @old = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1, created_at: 2.minutes.ago)
-    @new =  ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 0)
+describe ChecksumAuditLog, :type => :model do
+  let(:f) do
+    GenericFile.new.tap do |gf|
+      gf.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      gf.apply_depositor_metadata('mjg36')
+      gf.save!
+    end
+  end
+  let(:version) { f.datastreams['content'].versions.first }
+  let(:old) do
+    ChecksumAuditLog.create(pid: f.pid, dsid: version.dsid, version: version.versionID, pass: 1, created_at: 2.minutes.ago)
+  end
+  let(:new) do
+    ChecksumAuditLog.create(pid: f.pid, dsid: version.dsid, version: version.versionID, pass: 0, created_at: 1.minute.ago)
   end
   after(:all) do
-    @f.delete
-    ChecksumAuditLog.all.each(&:delete)
+    ChecksumAuditLog.destroy_all
   end
-  before(:each) do
-    GenericFile.any_instance.stub(:characterize).and_return(true) # stub out characterization so it does not get audited
+  before do
+    allow_any_instance_of(GenericFile).to receive(:characterize).and_return(true) # stub out characterization so it does not get audited
   end
-  it "should return a list of logs for this datastream sorted by date descending" do
-    @f.logs(@version.dsid).should == [@new, @old]
+  it "returns a list of logs for this datastream sorted by date descending" do
+    expect(f.logs(version.dsid)).to eq [new, old]
   end
-  it "should prune history for a datastream" do
-    success1 = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1)
-    ChecksumAuditLog.prune_history(@version)
-    success2 = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1)
-    ChecksumAuditLog.prune_history(@version)
-    success3 = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1)
-    ChecksumAuditLog.prune_history(@version)
-    lambda { ChecksumAuditLog.find(success2.id)}.should raise_exception ActiveRecord::RecordNotFound
-    lambda { ChecksumAuditLog.find(success3.id)}.should raise_exception ActiveRecord::RecordNotFound
-    ChecksumAuditLog.find(success1.id).should_not be_nil
-    @f.logs(@version.dsid).should == [success1, @new, @old]
+  describe "history pruning" do
+    before do
+      @success1 = ChecksumAuditLog.create(pid: f.pid, dsid: version.dsid, version: version.versionID, pass: 1)
+      ChecksumAuditLog.prune_history(version)
+      @success2 = ChecksumAuditLog.create(pid: f.pid, dsid: version.dsid, version: version.versionID, pass: 1)
+      ChecksumAuditLog.prune_history(version)
+      @success3 = ChecksumAuditLog.create(pid: f.pid, dsid: version.dsid, version: version.versionID, pass: 1)
+      ChecksumAuditLog.prune_history(version)
+    end
+    it "prunes history for a datastream" do
+      expect { ChecksumAuditLog.find(@success2.id)}.to raise_exception ActiveRecord::RecordNotFound
+      expect { ChecksumAuditLog.find(@success3.id)}.to raise_exception ActiveRecord::RecordNotFound
+      expect(ChecksumAuditLog.find(@success1.id)).not_to be_nil
+      expect(f.logs(version.dsid)).to eq [@success1, new, old]
+    end
   end
 end

data/spec/models/collection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Collection do
+describe Collection, :type => :model do
   before do
     @user = FactoryGirl.create(:user)
     @collection = Collection.new(title: "test collection").tap do |c|

data/spec/models/download_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::Download do
+describe Sufia::Download, :type => :model do
 
   before do
     @download = Sufia::Download

data/spec/models/featured_work_list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FeaturedWorkList do
+describe FeaturedWorkList, :type => :model do
   let(:file1) { FactoryGirl.create(:generic_file) }
   let(:file2) { FactoryGirl.create(:generic_file) }
 

data/spec/models/featured_work_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FeaturedWork do
+describe FeaturedWork, :type => :model do
   let(:feature) { FeaturedWork.create(generic_file_id:"99") }
 
   it "should have a file" do
@@ -21,7 +21,10 @@ describe FeaturedWork do
   describe "can_create_another?" do
     subject { FeaturedWork }
     context "when none exist" do
-      its(:can_create_another?) { should be true }
+      describe '#can_create_another?' do
+        subject { super().can_create_another? }
+        it { is_expected.to be true }
+      end
     end
     context "when five exist" do
       before do
@@ -29,13 +32,21 @@ describe FeaturedWork do
           FeaturedWork.create(generic_file_id:n.to_s)
         end
       end
-      its(:can_create_another?) { should be false }
+
+      describe '#can_create_another?' do
+        subject { super().can_create_another? }
+        it { is_expected.to be false }
+      end
     end
   end
 
   describe "#order" do
     subject { FeaturedWork.new(order: 5) }
-    its(:order) {should eq 5 }
+
+    describe '#order' do
+      subject { super().order }
+      it {is_expected.to eq 5 }
+    end
   end
 end
 

data/spec/models/file_content_datastream_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FileContentDatastream do
+describe FileContentDatastream, :type => :model do
   describe "version control" do
     before do
       f = GenericFile.new
@@ -16,16 +16,16 @@ describe FileContentDatastream do
       @file.content.versions.count == 1
     end
     it "should return the expected version ID" do
-      @file.content.versions.first.versionID.should == "content.0"
+      expect(@file.content.versions.first.versionID).to eq("content.0")
     end
     it "should support latest_version" do
-      @file.content.latest_version.versionID.should == "content.0"
+      expect(@file.content.latest_version.versionID).to eq("content.0")
     end
     it "should return the same version via get_version" do
-      @file.content.get_version("content.0").versionID.should == @file.content.latest_version.versionID
+      expect(@file.content.get_version("content.0").versionID).to eq(@file.content.latest_version.versionID)
     end
     it "should not barf when a garbage ID is provided to get_version"  do
-      @file.content.get_version("foobar").should be_nil
+      expect(@file.content.get_version("foobar")).to be_nil
     end
     describe "add a version" do
       before do
@@ -36,36 +36,36 @@ describe FileContentDatastream do
         @file.content.versions.count == 2
       end
       it "should return the newer version via latest_version" do
-        @file.content.versions.first.versionID.should == "content.1"
+        expect(@file.content.versions.first.versionID).to eq("content.1")
       end
       it "should return the same version via get_version" do
-        @file.content.get_version("content.1").versionID.should == @file.content.latest_version.versionID
+        expect(@file.content.get_version("content.1").versionID).to eq(@file.content.latest_version.versionID)
       end
     end
   end
   describe "extract_metadata" do
     before do
       @subject = FileContentDatastream.new(nil, 'content')
-      @subject.stub(pid: 'my_pid')
-      @subject.stub(dsVersionID: 'content.7')
+      allow(@subject).to receive_messages(pid: 'my_pid')
+      allow(@subject).to receive_messages(dsVersionID: 'content.7')
     end
     it "should return an xml document", unless: $in_travis do
       f = File.new(fixture_path + '/world.png', 'rb')
       @subject.content = f.read
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
-      doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
+      expect(doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text).to eq('50')
     end
     it "should return expected results when invoked via HTTP", unless: $in_travis do
       f = ActionDispatch::Http::UploadedFile.new(tempfile: File.new(fixture_path + '/world.png'),
                                                  filename: 'world.png')
       content = double("file")
-      content.stub(read: f.read)
-      content.stub(rewind: f.rewind)
-      @subject.stub(:content).and_return(f)
+      allow(content).to receive_messages(read: f.read)
+      allow(content).to receive_messages(rewind: f.rewind)
+      allow(@subject).to receive(:content).and_return(f)
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
-      doc.root.xpath('//ns:identity/@mimetype', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).first.value.should == 'image/png'
+      expect(doc.root.xpath('//ns:identity/@mimetype', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).first.value).to eq('image/png')
     end
   end
   describe "changed?" do

data/spec/models/file_usage_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FileUsage do
+describe FileUsage, :type => :model do
 
   before :all do
     @file = GenericFile.new

data/spec/models/fits_datastream_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FitsDatastream, unless: $in_travis do
+describe FitsDatastream, type: :model, unless: $in_travis do
   describe "image" do
     before(:all) do
       @file = GenericFile.new

data/spec/models/generic_file/reload_on_save_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-describe Sufia::GenericFile::ReloadOnSave do
+describe Sufia::GenericFile::ReloadOnSave, :type => :model do
   let(:user) { FactoryGirl.find_or_create(:jill) }
   let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
 
   it 'defaults to not call reload' do
-    file.should_not_receive(:reload)
+    expect(file).not_to receive(:reload)
     file.save
   end
 
   it 'can be set to call reload' do
     file.reload_on_save = true
-    file.should_receive(:reload)
+    expect(file).to receive(:reload)
     file.save
   end
 
   it 'allows reload to be turned off and on' do
     file.reload_on_save = true
-    file.should_receive(:reload).once
+    expect(file).to receive(:reload).once
     file.save
     file.reload_on_save = false
     file.save

data/spec/models/generic_file/visibility_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::GenericFile do
+describe Sufia::GenericFile, :type => :model do
   module VisibilityOverride
     extend ActiveSupport::Concern
     include Sufia::GenericFile::Permissions

data/spec/models/generic_file/web_form_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe GenericFile do
+describe GenericFile, :type => :model do
   before do
     subject.apply_depositor_metadata('jcoyne')
   end
 
   describe "terms_for_editing" do
     it "should return a list" do
-      subject.terms_for_editing.should == [:resource_type, :title, :creator, :contributor, :description, :tag,
-                    :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
+      expect(subject.terms_for_editing).to eq([:resource_type, :title, :creator, :contributor, :description, :tag,
+                    :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url])
     end
   end
   describe "terms_for_display" do
@@ -22,13 +22,14 @@ describe GenericFile do
 
   describe "accessible_attributes" do
     it "should have a list" do
-      subject.accessible_attributes.should include(:part_of, :resource_type, :title, :creator, :contributor, :description,
+      expect(subject.accessible_attributes).to include(:part_of, :resource_type, :title, :creator, :contributor, :description,
         :tag, :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url, :permissions)
     end
 
     it "should sanitize them" do
-      subject.sanitize_attributes({'part_of' => 'A book', 'something_crazy' => "get's thrown out"}).should ==
+      expect(subject.sanitize_attributes({'part_of' => 'A book', 'something_crazy' => "get's thrown out"})).to eq(
         {'part_of' => 'A book'}
+      )
     end
   end
 end