sufia 0.0.1.pre1 → 0.0.1.pre2

data/spec/fixtures/scholarsphere/sufia_scholarsphere1.txt

@@ -0,0 +1 @@
+This is a test fixture for scholarsphere: scholarsphere1.

data/spec/fixtures/scholarsphere/{scholarsphere_test1.foxml.erb → sufia_test1.foxml.erb}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject PID="scholarsphere:test1" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+<foxml:digitalObject PID="sufia:test1" 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 Data 1.txt</dc:title>
-          <dc:identifier>scholarsphere:test1</dc:identifier>
+          <dc:identifier>sufia:test1</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:<%=Rails.root%>/spec/fixtures/scholarsphere/scholarsphere_test1.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test1.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" 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:test1">
+          <rdf:Description rdf:about="info:fedora/sufia:test1">
             <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 1"
       MIMETYPE="text/plain" SIZE="25">
-      <foxml:contentLocation REF="file:<%=Rails.root%>/spec/fixtures/scholarsphere/scholarsphere_test1.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test1.txt" 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/scholarsphere/{scholarsphere_test5.foxml.erb → sufia_test5.foxml.erb}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject PID="scholarsphere:test5" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+<foxml:digitalObject PID="sufia:test5" 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 mp3</dc:title>
-          <dc:identifier>scholarsphere:test5</dc:identifier>
+          <dc:identifier>sufia:test5</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:<%=Rails.root%>/spec/fixtures/scholarsphere/scholarsphere_test5.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test5.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream ID="properties" STATE="A" CONTROL_GROUP="X" 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:test5">
+          <rdf:Description rdf:about="info:fedora/sufia:test5">
             <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 1"
       MIMETYPE="audio/mpeg3" SIZE="25">
-      <foxml:contentLocation REF="file:<%=Rails.root%>/spec/fixtures/scholarsphere/scholarsphere_test5.mp3" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@localDir%>/scholarsphere/scholarsphere_test5.mp3" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="rightsMetadata" STATE="A" VERSIONABLE="true">

data/spec/fixtures/scholarsphere_generic_stub.foxml.erb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject PID="<%=ScholarSphere::Application.config.id_namespace%>:<%= @id %>" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+<foxml:digitalObject PID="<%=SUFIA_TEST_NS%>:<%= @id %>" 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><%= @title %></dc:title>
-          <dc:identifier><%=ScholarSphere::Application.config.id_namespace%>:<%= @id %></dc:identifier>
+          <dc:identifier><%=SUFIA_TEST_NS%>:<%= @id %></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:<%=@root%>/spec/fixtures/scholarsphere/<%=ScholarSphere::Application.config.id_namespace%>_<%= @id %>.descMeta.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@root%>/scholarsphere/<%=SUFIA_TEST_NS%>_<%= @id %>.descMeta.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="RELS-EXT" STATE="A" VERSIONABLE="true">
@@ -29,7 +29,7 @@
       LABEL="Fedora Object-to-Object Relationship Metadata" MIMETYPE="application/rdf+xml">
       <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::Application.config.id_namespace%>:<%= @id %>">
+          <rdf:Description rdf:about="info:fedora/<%=SUFIA_TEST_NS%>:<%= @id %>">
             <ns0:hasModel rdf:resource="info:fedora/afmodel:GenericFile"/>
           </rdf:Description>
         </rdf:RDF>
@@ -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%>/spec/fixtures/scholarsphere/<%=ScholarSphere::Application.config.id_namespace%>_<%= @id %>.txt" TYPE="URL"/>
+      <foxml:contentLocation REF="file:<%=@root%>/scholarsphere/<%=SUFIA_TEST_NS%>_<%= @id %>.txt" TYPE="URL"/>
     </foxml:datastreamVersion>
   </foxml:datastream>
   <foxml:datastream CONTROL_GROUP="X" ID="rightsMetadata" STATE="A" VERSIONABLE="true">

data/spec/lib/{scholarsphere → sufia}/id_service_spec.rb

@@ -14,16 +14,16 @@
 
 require 'spec_helper'
 
-describe ScholarSphere::IdService do
+describe Sufia::IdService do
   describe "mint" do
     before(:all) do
-      @id = ScholarSphere::IdService.mint
+      @id = Sufia::IdService.mint
     end
     it "should create a unique id" do
       @id.should_not be_empty
     end
     it "should not mint the same id twice in a row" do
-      other_id = ScholarSphere::IdService.mint
+      other_id = Sufia::IdService.mint
       other_id.should_not == @id
     end  
     it "should create many unique ids" do
@@ -31,7 +31,7 @@ describe ScholarSphere::IdService do
       threads = (1..10).map do
         Thread.new do
           100.times do
-            a <<  ScholarSphere::IdService.mint
+            a <<  Sufia::IdService.mint
           end
         end
       end
@@ -46,7 +46,7 @@ describe ScholarSphere::IdService do
           threads = (1..10).map do
             Thread.new do
               20.times do
-                wr.write ScholarSphere::IdService.mint
+                wr.write Sufia::IdService.mint
                 wr.write " "
               end
             end

data/spec/lib/{scholarsphere → sufia}/role_mapper_spec.rb

@@ -19,7 +19,10 @@ describe RoleMapper do
     @user = FactoryGirl.create(:user)
     User.any_instance.stubs(:groups).returns(["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"])
   end
-  subject {::RoleMapper.roles(@user.login)}
-  it { should == ["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"]}
+  subject {::RoleMapper.roles(@user.user_key)}
+  it "should return LDAP groups" do
+    pending "This is for Penn only"
+    subject.should == ["umg/up.dlt.gamma-ci", "umg/up.dlt.redmine"]
+  end
 end
 

data/spec/models/audit_job_spec.rb

@@ -21,7 +21,7 @@ describe AuditJob do
     GenericFile.any_instance.expects(:characterize_if_changed).yields
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
     @file = GenericFile.new
-    @file.apply_depositor_metadata(@user.login)
+    @file.apply_depositor_metadata(@user.user_key)
     @file.save
     @ds = @file.datastreams.first
   end

data/spec/models/batch_spec.rb

@@ -23,7 +23,7 @@ describe Batch do
     @file.apply_depositor_metadata('mjg36')
     @file.save
     @batch = Batch.create(:title => "test collection",
-                          :creator => @user.login,
+                          :creator => @user.user_key,
                           :part => @file.pid)
   end
   after(:all) do
@@ -38,7 +38,7 @@ describe Batch do
     @batch.descMetadata.should be_kind_of BatchRdfDatastream
   end
   it "should belong to testuser" do
-    @batch.creator.should == [@user.login]
+    @batch.creator.should == [@user.user_key]
   end
   it "should be titled 'test collection'" do
     @batch.title.should == ["test collection"]

data/spec/models/batch_update_job_spec.rb

@@ -21,7 +21,7 @@ describe BatchUpdateJob do
     @batch = Batch.new
     @batch.save
     @file = GenericFile.new(:batch=>@batch)
-    @file.apply_depositor_metadata(@user.login)
+    @file.apply_depositor_metadata(@user.user_key)
     @file.save
     @file2 = GenericFile.new(:batch=>@batch)
     @file2.apply_depositor_metadata('otherUser')
@@ -39,7 +39,7 @@ describe BatchUpdateJob 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.login, params, params[:generic_file])
+      BatchUpdateJob.perform(@user.user_key, params, params[:generic_file])
       @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)
@@ -49,10 +49,10 @@ describe BatchUpdateJob 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.login).once
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @file2.pid, @user.login).once
+      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.login, params, params[:generic_file])
+      BatchUpdateJob.perform(@user.user_key, params, params[:generic_file])
       @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

@@ -19,7 +19,7 @@ describe ChecksumAuditLog 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.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+    @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @f.apply_depositor_metadata('mjg36')
     @f.save
     @version = @f.datastreams['content'].versions.first

data/spec/models/event_jobs_spec.rb

@@ -21,7 +21,7 @@ describe 'event jobs' do
     @third_user = FactoryGirl.find_or_create(:curator)
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
     @gf = GenericFile.new(pid: 'test:123')
-    @gf.apply_depositor_metadata(@user.login)
+    @gf.apply_depositor_metadata(@user.user_key)
     @gf.title = 'Hamlet'
     @gf.save
   end
@@ -40,8 +40,8 @@ describe 'event jobs' do
     count_user = @user.events.length
     count_another = @another_user.events.length
     Time.expects(:now).returns(1).at_least_once
-    event = { action: 'User <a href="/users/jilluser">jilluser</a> has edited his or her profile', timestamp: '1' }
-    UserEditProfileEventJob.perform(@user.login)
+    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)
     @user.events.length.should == count_user + 1
     @user.events.first.should == event
     @another_user.events.length.should == count_another + 1
@@ -54,8 +54,8 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = { action: 'User <a href="/users/jilluser">jilluser</a> is now following <a href="/users/archivist1">archivist1</a>', timestamp: '1' }
-    UserFollowEventJob.perform(@user.login, @another_user.login)
+    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)
     @user.events.length.should == 1
     @user.events.first.should == event
     @another_user.events.length.should == 1
@@ -71,8 +71,8 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = { action: 'User <a href="/users/jilluser">jilluser</a> has unfollowed <a href="/users/archivist1">archivist1</a>', timestamp: '1' }
-    UserUnfollowEventJob.perform(@user.login, @another_user.login)
+    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)
     @user.events.length.should == 1
     @user.events.first.should == event
     @another_user.events.length.should == 1
@@ -90,8 +90,8 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = {action: 'User <a href="/users/jilluser">jilluser</a> has deposited <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentDepositEventJob.perform('test:123', @user.login)
+    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)
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -111,8 +111,8 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = {action: 'User <a href="/users/jilluser">jilluser</a> has updated <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentUpdateEventJob.perform('test:123', @user.login)
+    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)
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -132,8 +132,8 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = {action: 'User <a href="/users/jilluser">jilluser</a> has added a new version of <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentNewVersionEventJob.perform('test:123', @user.login)
+    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)
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -153,8 +153,8 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = {action: 'User <a href="/users/jilluser">jilluser</a> has restored a version \'content.0\' of <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentRestoredVersionEventJob.perform('test:123', @user.login, 'content.0')
+    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')
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -172,8 +172,8 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.expects(:now).returns(1).at_least_once
-    event = {action: 'User <a href="/users/jilluser">jilluser</a> has deleted file \'test:123\'', timestamp: '1' }
-    ContentDeleteEventJob.perform('test:123', @user.login)
+    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)
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 1
@@ -191,8 +191,8 @@ describe 'event jobs' do
     @gf.events.length.should == 0
     @now = Time.now
     Time.expects(:now).returns(@now).at_least_once
-    event = {action: 'User <a href="/users/jilluser">jilluser</a> has updated <a href="/files/123">Hamlet</a>', timestamp: @now.to_i.to_s }
-    ContentUpdateEventJob.perform('test:123', @user.login)
+    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)
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
     @another_user.events.length.should == 0

data/spec/models/file_content_datastream_spec.rb

@@ -25,7 +25,7 @@ describe FileContentDatastream do
     before(:all) do
       GenericFile.any_instance.stubs(:terms_of_service).returns('1')
       f = GenericFile.new
-      f.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+      f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       f.expects(:characterize_if_changed).yields
       f.apply_depositor_metadata('mjg36')
       f.save
@@ -51,7 +51,7 @@ describe FileContentDatastream do
     end
     describe "add a version" do
       before(:all) do
-        @file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+        @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
         @file.expects(:characterize_if_changed).yields
         @file.save
       end
@@ -74,7 +74,7 @@ describe FileContentDatastream do
     it "should return an xml document" do
       repo = mock("repo")
       repo.stubs(:config=>{})
-      f = File.new(Rails.root + 'spec/fixtures/world.png')
+      f = File.new(fixture_path + '/world.png')
       content = mock("file")
       content.stubs(:read=>f.read)
       content.stubs(:rewind=>f.rewind)
@@ -86,7 +86,7 @@ describe FileContentDatastream do
     it "should return expected results when invoked via HTTP" do
       repo = mock("repo")
       repo.stubs(:config=>{})
-      f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(Rails.root + 'spec/fixtures/world.png'),
+      f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
                                                  :filename => 'world.png')
       content = mock("file")
       content.stubs(:read=>f.read)
@@ -106,13 +106,13 @@ describe FileContentDatastream do
       @generic_file.delete
     end
     it "should only return true when the datastream has actually changed" do
-      @generic_file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+      @generic_file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @generic_file.content.changed?.should be_true
       @generic_file.save
       @generic_file.content.changed?.should be_false
 
       # Add a thumbnail ds
-      @generic_file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'thumbnail')
+      @generic_file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'thumbnail')
       @generic_file.thumbnail.changed?.should be_true
       @generic_file.content.changed?.should be_false
 

data/spec/models/fits_datastream_spec.rb

@@ -18,7 +18,7 @@ describe FitsDatastream do
   before(:all) do
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
     @file = GenericFile.new
-    @file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+    @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @file.apply_depositor_metadata('mjg36')
     @file.save
     @file = GenericFile.find(@file.pid)

data/spec/models/generic_file_spec.rb

@@ -86,7 +86,7 @@ describe GenericFile do
       @file.descMetadata.should be_kind_of GenericFileRdfDatastream
     end
     it "should have content datastream" do
-      @file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+      @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @file.content.should be_kind_of FileContentDatastream
     end
   end
@@ -228,8 +228,7 @@ describe GenericFile do
       before do
         @f = GenericFile.new
         @f.stubs(:mime_type=>'image/png', :width=>['50'], :height=>['50'])  #Would get set by the characterization job
-        @f.stubs(:to_solr).returns({})
-        @f.add_file_datastream(File.new("#{Rails.root}/spec/fixtures/world.png"), :dsid=>'content')
+        @f.add_file_datastream(File.new("#{fixture_path}/world.png"), :dsid=>'content')
         @f.apply_depositor_metadata('mjg36')
         @f.save
         @mock_image = mock("image", :from_blob=>true)
@@ -251,7 +250,7 @@ describe GenericFile do
       GenericFile.any_instance.stubs(:terms_of_service).returns('1')
       GenericFile.any_instance.stubs(:characterize).returns(true)
       f = GenericFile.new
-      f.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+      f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       f.apply_depositor_metadata('mjg36')
       f.save
       @f = GenericFile.find(f.pid)
@@ -287,7 +286,7 @@ describe GenericFile do
       @file.delete
     end
     it "should schedule a characterization job" do
-      @file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+      @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       Resque.expects(:enqueue).once
       @file.save
     end
@@ -387,14 +386,14 @@ describe GenericFile do
       @new_file.noid.should == '123'
     end
     it "should work outside of an instance" do
-      new_id = ScholarSphere::IdService.mint
+      new_id = Sufia::IdService.mint
       noid = new_id.split(':').last
-      ScholarSphere::Noid.noidify(new_id).should == noid
+      Sufia::Noid.noidify(new_id).should == noid
     end
   end
   describe "characterize" do
     it "should return expected results when called" do
-      @file.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content')
+      @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @file.characterize
       doc = Nokogiri::XML.parse(@file.characterization.content)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
@@ -412,7 +411,7 @@ describe GenericFile do
       before(:all) do
         GenericFile.any_instance.stubs(:terms_of_service).returns('1')
         myfile = GenericFile.new
-        myfile.add_file_datastream(File.new(Rails.root + 'spec/fixtures/scholarsphere/scholarsphere_test4.pdf'), :dsid=>'content')
+        myfile.add_file_datastream(File.new(fixture_path + '/scholarsphere/scholarsphere_test4.pdf'), :dsid=>'content')
         myfile.label = 'label123'
         myfile.thumbnail.size.nil?.should be_true
         myfile.apply_depositor_metadata('mjg36')