sufia 0.0.1.pre2 → 0.0.1

data/spec/fixtures/sufia/sufia_test4.descMeta.txt

@@ -0,0 +1,12 @@
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/publisher> "archivist1" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/description> "Test Document PDF Description" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/created> "4/11/2012" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/contributor> "archivist1" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/title> "Test Document PDF" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/relation> "test" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/subject> "PDF Test" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/language> "En" .
+<info:fedora/sufia:test4> <http://xmlns.com/foaf/0.1/based_near> "State College" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/rights> "archivist1@example.com" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/creator> "archivist1@example.com" .
+<info:fedora/sufia:test4> <http://purl.org/dc/terms/identifier> "Test" .

data/spec/fixtures/{scholarsphere/scholarsphere_test4.foxml.erb → sufia/sufia_test4.foxml.erb}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject PID="scholarsphere:test4" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+<foxml:digitalObject PID="sufia:test4" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
   <foxml:objectProperties>
     <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
@@ -14,7 +14,7 @@
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
           <dc:title>Test Data PDF</dc:title>
-          <dc:identifier>scholarsphere:test4</dc:identifier>
+          <dc:identifier>sufia:test4</dc:identifier>
         </oai_dc:dc>
       </foxml:xmlContent>
     </foxml:datastreamVersion>
@@ -32,7 +32,7 @@
   
   <foxml:datastream CONTROL_GROUP="M" ID="descMetadata" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="descMetadata.0" LABEL="" MIMETYPE="text/plain">
-      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test4.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/sufia/sufia_test4.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
@@ -40,7 +40,7 @@
       LABEL="Fedora Object-to-Object Relationship Metadata" MIMETYPE="application/rdf+xml" SIZE="286">
       <foxml:xmlContent>
         <rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/scholarsphere:test4">
+          <rdf:Description rdf:about="info:fedora/sufia:test4">
             <ns0:hasModel rdf:resource="info:fedora/afmodel:GenericFile"/>
           </rdf:Description>
         </rdf:RDF>
@@ -50,7 +50,7 @@
   <foxml:datastream CONTROL_GROUP="M" ID="content" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="content.0" LABEL="Test Data PDF"
       MIMETYPE="application/pdf" SIZE="25">
-      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test4.pdf" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/sufia/sufia_test4.pdf" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="rightsMetadata" STATE="A" VERSIONABLE="true">
@@ -77,7 +77,7 @@
           <access type="edit">
             <human/>
             <machine>
-              <person>archivist1</person>
+              <person>archivist1@example.com</person>
             </machine>
           </access>
           <embargo>

data/spec/fixtures/sufia/sufia_test5.descMeta.txt

@@ -0,0 +1,19 @@
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/publisher> "archivist1" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/description> "Test mp3 Description" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/created> "04/11/2012" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/contributor> "archivist1" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/title> "Test mp3" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "test" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keya" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keyb" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keyc" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keyd" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keye" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keyf" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/relation> "keyg" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/subject> "Test mp3 Test" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/language> "En" .
+<info:fedora/sufia:test5> <http://xmlns.com/foaf/0.1/based_near> "State College" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/rights> "archivist2@example.com" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/creator> "archivist1@example.com" .
+<info:fedora/sufia:test5> <http://purl.org/dc/terms/identifier> "Test" .

data/spec/fixtures/{scholarsphere → sufia}/sufia_test5.foxml.erb

@@ -21,7 +21,7 @@
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="M" ID="descMetadata" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="descMetadata.0" LABEL="" MIMETYPE="text/plain">
-      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test5.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/sufia/sufia_test5.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
@@ -50,7 +50,7 @@
   <foxml:datastream CONTROL_GROUP="M" ID="content" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="content.0" LABEL="Test Data 1"
       MIMETYPE="audio/mpeg3" SIZE="25">
-      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test5.mp3" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/sufia/sufia_test5.mp3" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="rightsMetadata" STATE="A" VERSIONABLE="true">
@@ -76,7 +76,7 @@
           <access type="edit">
             <human/>
             <machine>
-              <person>archivist2</person>
+              <person>archivist2@example.com</person>
             </machine>
           </access>
           <embargo>

data/spec/fixtures/sufia/sufia_test5.txt

@@ -0,0 +1 @@
+This is a test fixture for sufia: test5.

data/spec/fixtures/sufia/sufia_test6.descMeta.txt

@@ -0,0 +1,12 @@
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/publisher> "archivist1" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/description> "Test Image Description" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/created> "06/11/2012" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/contributor> "archivist1" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/title> "Test Image" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/relation> "test" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/subject> "Test Image Test" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/language> "En" .
+<info:fedora/sufia:test6> <http://xmlns.com/foaf/0.1/based_near> "State College" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/rights> "archivist1@example.com" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/creator> "archivist1@example.com" .
+<info:fedora/sufia:test6> <http://purl.org/dc/terms/identifier> "Test" .

data/spec/fixtures/{scholarsphere/scholarsphere_test6.foxml.erb → sufia/sufia_test6.foxml.erb}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject PID="scholarsphere:test6" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+<foxml:digitalObject PID="sufia:test6" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
   <foxml:objectProperties>
     <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
@@ -14,14 +14,14 @@
           xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
           <dc:title>Test Image</dc:title>
-          <dc:identifier>scholarsphere:test6</dc:identifier>
+          <dc:identifier>sufia:test6</dc:identifier>
         </oai_dc:dc>
       </foxml:xmlContent>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="M" ID="descMetadata" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="descMetadata.0" LABEL="" MIMETYPE="text/plain">
-      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test6.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/sufia/sufia_test6.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
@@ -39,7 +39,7 @@
       LABEL="Fedora Object-to-Object Relationship Metadata" MIMETYPE="application/rdf+xml" SIZE="286">
       <foxml:xmlContent>
         <rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/scholarsphere:test6">
+          <rdf:Description rdf:about="info:fedora/sufia:test6">
             <ns0:hasModel rdf:resource="info:fedora/afmodel:GenericFile"/>
           </rdf:Description>
         </rdf:RDF>
@@ -49,7 +49,7 @@
   <foxml:datastream CONTROL_GROUP="M" ID="content" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="content.0" LABEL="Test Data 1"
       MIMETYPE="image/jpeg">
-      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test6.jp2" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/sufia/sufia_test6.jp2" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="rightsMetadata" STATE="A" VERSIONABLE="true">
@@ -75,7 +75,7 @@
           <access type="edit">
             <human/>
             <machine>
-              <person>archivist1</person>
+              <person>archivist1@example.com</person>
             </machine>
           </access>
           <embargo>

data/spec/fixtures/sufia/sufia_test6.txt

@@ -0,0 +1 @@
+This is a test fixture for sufia: test6.

data/spec/fixtures/sufia_generic_stub.descMeta.txt

@@ -0,0 +1,12 @@
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/publisher> "<%= @user %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/description> "<%= @title %> Description" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/created> "<%= Time.now.strftime("%m/%d/%Y") %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/contributor> "<%= @user %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/title> "<%= @title %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/relation> "test" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/subject> "<%= @title %> Test" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/language> "En" .
+<info:fedora/sufia:<%= @id %>> <http://xmlns.com/foaf/0.1/based_near> "State College" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/rights> "<%= @user %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/creator> "<%= @user %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/identifier> "Test" .

data/spec/fixtures/{scholarsphere_generic_stub.foxml.erb → sufia_generic_stub.foxml.erb}

@@ -21,7 +21,7 @@
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="M" ID="descMetadata" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="descMetadata.0" LABEL="" MIMETYPE="text/plain">
-      <foxml:contentLocation REF="file:<%=@root%>/scholarsphere/<%=SUFIA_TEST_NS%>_<%= @id %>.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@root%>/sufia/<%=SUFIA_TEST_NS%>_<%= @id %>.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
@@ -39,7 +39,7 @@
   <foxml:datastream CONTROL_GROUP="M" ID="content" STATE="A" VERSIONABLE="true">
     <foxml:datastreamVersion ID="content.0" LABEL="Test Data 1"
       MIMETYPE="text/plain" >
-      <foxml:contentLocation REF="file:<%=@root%>/scholarsphere/<%=SUFIA_TEST_NS%>_<%= @id %>.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@root%>/sufia/<%=SUFIA_TEST_NS%>_<%= @id %>.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="rightsMetadata" STATE="A" VERSIONABLE="true">
@@ -65,7 +65,7 @@
           <access type="edit">
             <human/>
             <machine>
-              <person>cam156@psu.edu</person>
+              <person>archivist1@example.com</person>
             </machine>
           </access>
           <embargo>

data/spec/fixtures/sufia_generic_stub.txt

@@ -0,0 +1 @@
+This is a test fixture for sufia: <%= @id %>.

data/spec/lib/sufia/role_mapper_spec.rb

@@ -17,7 +17,7 @@ require 'spec_helper'
 describe RoleMapper do
   before do
     @user = FactoryGirl.create(:user)
-    User.any_instance.stubs(:groups).returns(["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"])
+    User.any_instance.stub(:groups).and_return(["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"])
   end
   subject {::RoleMapper.roles(@user.user_key)}
   it "should return LDAP groups" do

data/spec/models/audit_job_spec.rb

@@ -15,34 +15,31 @@
 require 'spec_helper'
 
 describe AuditJob do
-  before(:all) do
+  before do
     @user = FactoryGirl.find_or_create(:user)
     @inbox = @user.mailbox.inbox
-    GenericFile.any_instance.expects(:characterize_if_changed).yields
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.apply_depositor_metadata(@user.user_key)
     @file.save
     @ds = @file.datastreams.first
   end
-  after(:all) do
-    # clear any existing messages
-    @inbox.each(&:delete)
-    @user.delete
+  after do
     @file.delete
   end
   describe "passing audit" do
     it "should not send passing mail" do
-      ActiveFedora::RelsExtDatastream.any_instance.stubs(:dsChecksumValid).returns(true)
-      Resque.enqueue(AuditJob, @file.pid, @ds[0], @ds[1].versionID)
+      ActiveFedora::RelsExtDatastream.any_instance.stub(:dsChecksumValid).and_return(true)
+      AuditJob.new(@file.pid, @ds[0], @ds[1].versionID).run
       @inbox = @user.mailbox.inbox
       @inbox.count.should == 0
     end
   end
   describe "failing audit" do
     it "should send failing mail" do
-      ActiveFedora::RelsExtDatastream.any_instance.stubs(:dsChecksumValid).returns(false)
-      Resque.enqueue(AuditJob, @file.pid, @ds[0], @ds[1].versionID)
+      ActiveFedora::RelsExtDatastream.any_instance.stub(:dsChecksumValid).and_return(false)
+      AuditJob.new(@file.pid, @ds[0], @ds[1].versionID).run
       @inbox = @user.mailbox.inbox
       @inbox.count.should == 1
       @inbox.each { |msg| msg.last_message.subject.should == AuditJob::FAIL }

data/spec/models/batch_spec.rb

@@ -17,8 +17,8 @@ require 'spec_helper'
 describe Batch do
   before(:all) do
     @user = FactoryGirl.find_or_create(:user)
-    GenericFile.any_instance.expects(:characterize_if_changed).yields
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.apply_depositor_metadata('mjg36')
     @file.save
@@ -51,7 +51,7 @@ describe Batch do
   end
   it "should be able to have more than one file" do
     # not sure why this is needed here too, but when the test runs alone it is not needed but when run in the group it is needed
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     #logger.info "before create"
     gf = GenericFile.new
     #logger.info "after create"
@@ -71,14 +71,14 @@ describe Batch do
   describe "find_or_create" do
     describe "when the object exists" do
       it "should find batch instead of creating" do
-        Batch.expects(:create).never
+        Batch.should_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.expects(:create).once.returns("the batch")
+        Batch.should_receive(:create).once.and_return("the batch")
         @b2 = Batch.find_or_create( "batch:123")
         @b2.should == "the batch"
       end

data/spec/models/batch_update_job_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # Copyright © 2012 The Pennsylvania State University
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +16,8 @@
 require 'spec_helper'
 
 describe BatchUpdateJob do
-  before(:all) do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+  before do
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     @batch = Batch.new
     @batch.save
@@ -27,19 +28,17 @@ describe BatchUpdateJob do
     @file2.apply_depositor_metadata('otherUser')
     @file2.save
   end
-  after(:all) do
-    # clear any existing messages
+  after do
     @batch.delete
-    @user.delete
     @file.delete
     @file2.delete
   end
   describe "failing update" do
     it "should check permissions for each file before updating" do
-      BatchUpdateJob.any_instance.stubs(:get_permissions_solr_response_for_doc_id).returns(["","mock solr permissions"])       
-      User.any_instance.expects(:can?).with(:edit, "mock solr permissions").times(2)
-      params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}
-      BatchUpdateJob.perform(@user.user_key, params, params[:generic_file])
+      BatchUpdateJob.any_instance.stub(:get_permissions_solr_response_for_doc_id).and_return(["","mock solr permissions"])       
+      User.any_instance.should_receive(:can?).with(:edit, "mock solr permissions").exactly(2).times
+       params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
+      BatchUpdateJob.new(@user.user_key, params).run
       @user.mailbox.inbox[0].messages[0].subject.should == "Batch upload permission denied"
       @user.mailbox.inbox[0].messages[0].move_to_trash @user
       #b = Batch.find(@batch.pid)
@@ -47,12 +46,16 @@ describe BatchUpdateJob do
   end
   describe "passing update" do
     it "should log a content update event" do
-      BatchUpdateJob.any_instance.stubs(:get_permissions_solr_response_for_doc_id).returns(["","mock solr permissions"])       
-      User.any_instance.expects(:can?).with(:edit, "mock solr permissions").times(2).returns(true)
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @file.pid, @user.user_key).once
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @file2.pid, @user.user_key).once
-      params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}
-      BatchUpdateJob.perform(@user.user_key, params, params[:generic_file])
+      BatchUpdateJob.any_instance.stub(:get_permissions_solr_response_for_doc_id).and_return(["","mock solr permissions"])       
+      User.any_instance.should_receive(:can?).with(:edit, "mock solr permissions").exactly(2).times.and_return(true)
+      s1 = stub('one')
+      ContentUpdateEventJob.should_receive(:new).with(@file.pid, @user.user_key).and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+      s2 = stub('two')
+      ContentUpdateEventJob.should_receive(:new).with(@file2.pid, @user.user_key).and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
+      params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
+      BatchUpdateJob.new(@user.user_key, params).run
       @user.mailbox.inbox[0].messages[0].subject.should == "Batch upload complete"
       @user.mailbox.inbox[0].messages[0].move_to_trash @user
     end

data/spec/models/checksum_audit_log_spec.rb

@@ -16,22 +16,22 @@ require 'spec_helper'
 
 describe ChecksumAuditLog do
   before(:all) do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-    GenericFile.any_instance.stubs(:characterize).returns(true) # stub out characterization so it does not get audited
-    @f = GenericFile.new
+    @f = GenericFile.new(:terms_of_service => '1')
     @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @f.apply_depositor_metadata('mjg36')
-    @f.save
+    @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)
-    @different_ds = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>'descMetadata', :version=>'descMetadata.0', :pass=>0)
-    @different_pid = ChecksumAuditLog.create(:pid=>"other_pid", :dsid=>'content', :version=>'content.0', :pass=>0)
   end
   after(:all) do
     @f.delete
     ChecksumAuditLog.all.each(&:delete)
   end
+  before(:each) do
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
+    GenericFile.any_instance.stub(: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]
   end
@@ -47,17 +47,4 @@ describe ChecksumAuditLog do
     ChecksumAuditLog.find(success1.id).should_not be_nil
     @f.logs(@version.dsid).should == [success1, @new, @old]
   end
-  it "should not prune failed audits" do
-    FileContentDatastream.any_instance.expects(:dsChecksumValid).returns(true)
-    @f.audit!
-    FileContentDatastream.any_instance.expects(:dsChecksumValid).returns(false)
-    @f.audit!
-    FileContentDatastream.any_instance.expects(:dsChecksumValid).returns(false)
-    @f.audit!
-    FileContentDatastream.any_instance.expects(:dsChecksumValid).returns(true)
-    @f.audit!
-    FileContentDatastream.any_instance.expects(:dsChecksumValid).returns(false)
-    @f.audit!
-    @f.logs(@version.dsid).map(&:pass).should == [0, 1, 0, 0, 1, 0, 1]
-  end
 end

data/spec/models/event_jobs_spec.rb

@@ -19,7 +19,7 @@ describe 'event jobs' do
     @user = FactoryGirl.find_or_create(:user)
     @another_user = FactoryGirl.find_or_create(:archivist)
     @third_user = FactoryGirl.find_or_create(:curator)
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @gf = GenericFile.new(pid: 'test:123')
     @gf.apply_depositor_metadata(@user.user_key)
     @gf.title = 'Hamlet'
@@ -39,9 +39,9 @@ describe 'event jobs' do
     @another_user.follow(@user)
     count_user = @user.events.length
     count_another = @another_user.events.length
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = { action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has edited his or her profile', timestamp: '1' }
-    UserEditProfileEventJob.perform(@user.user_key)
+    UserEditProfileEventJob.new(@user.user_key).run
     @user.events.length.should == count_user + 1
     @user.events.first.should == event
     @another_user.events.length.should == count_another + 1
@@ -53,9 +53,9 @@ describe 'event jobs' do
     @user.events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = { action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> is now following <a href="/users/archivist1@example.com">archivist1@example.com</a>', timestamp: '1' }
-    UserFollowEventJob.perform(@user.user_key, @another_user.user_key)
+    UserFollowEventJob.new(@user.user_key, @another_user.user_key).run
     @user.events.length.should == 1
     @user.events.first.should == event
     @another_user.events.length.should == 1
@@ -70,9 +70,9 @@ describe 'event jobs' do
     @user.events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = { action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has unfollowed <a href="/users/archivist1@example.com">archivist1@example.com</a>', timestamp: '1' }
-    UserUnfollowEventJob.perform(@user.user_key, @another_user.user_key)
+    UserUnfollowEventJob.new(@user.user_key, @another_user.user_key).run
     @user.events.length.should == 1
     @user.events.first.should == event
     @another_user.events.length.should == 1
@@ -84,14 +84,14 @@ describe 'event jobs' do
     # ContentDeposit should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
-    User.any_instance.stubs(:can?).returns(true)
+    User.any_instance.stub(:can?).and_return(true)
     @user.profile_events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has deposited <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentDepositEventJob.perform('test:123', @user.user_key)
+    ContentDepositEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -105,14 +105,14 @@ describe 'event jobs' do
     # ContentUpdate should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
-    User.any_instance.stubs(:can?).returns(true)
+    User.any_instance.stub(:can?).and_return(true)
     @user.profile_events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has updated <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentUpdateEventJob.perform('test:123', @user.user_key)
+    ContentUpdateEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -126,14 +126,14 @@ describe 'event jobs' do
     # ContentNewVersion should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
-    User.any_instance.stubs(:can?).returns(true)
+    User.any_instance.stub(:can?).and_return(true)
     @user.profile_events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has added a new version of <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentNewVersionEventJob.perform('test:123', @user.user_key)
+    ContentNewVersionEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -147,14 +147,14 @@ describe 'event jobs' do
     # ContentRestoredVersion should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
-    User.any_instance.stubs(:can?).returns(true)
+    User.any_instance.stub(:can?).and_return(true)
     @user.profile_events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has restored a version \'content.0\' of <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentRestoredVersionEventJob.perform('test:123', @user.user_key, 'content.0')
+    ContentRestoredVersionEventJob.new('test:123', @user.user_key, 'content.0').run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -171,9 +171,9 @@ describe 'event jobs' do
     @user.profile_events.length.should == 0
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
-    Time.expects(:now).returns(1).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(1)
     event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has deleted file \'test:123\'', timestamp: '1' }
-    ContentDeleteEventJob.perform('test:123', @user.user_key)
+    ContentDeleteEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -190,9 +190,9 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     @now = Time.now
-    Time.expects(:now).returns(@now).at_least_once
+    Time.should_receive(:now).at_least(:once).and_return(@now)
     event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has updated <a href="/files/123">Hamlet</a>', timestamp: @now.to_i.to_s }
-    ContentUpdateEventJob.perform('test:123', @user.user_key)
+    ContentUpdateEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 0