sufia 0.0.1.pre1 → 0.0.1.pre2

data/spec/config/host_to_vhost_spec.rb

@@ -17,22 +17,22 @@ require 'spec_helper'
 describe 'host_to_vhost' do
   it "should return the proper vhost on fedora1test" do
     Socket.stubs(:gethostname).returns('fedora1test')
-    ScholarSphere::Application.get_vhost_by_host[0].should == 'scholarsphere-integration.dlt.psu.edu-8443'
-    ScholarSphere::Application.get_vhost_by_host[1].should == 'https://scholarsphere-integration.dlt.psu.edu:8443/'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[0].should == 'scholarsphere-integration.dlt.psu.edu-8443'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[1].should == 'https://scholarsphere-integration.dlt.psu.edu:8443/'
   end
   it "should return the proper vhost on fedora2test" do
     Socket.stubs(:gethostname).returns('fedora2test')
-    ScholarSphere::Application.get_vhost_by_host[0].should == 'scholarsphere-test.dlt.psu.edu'
-    ScholarSphere::Application.get_vhost_by_host[1].should == 'https://scholarsphere-test.dlt.psu.edu/'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[0].should == 'scholarsphere-test.dlt.psu.edu'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[1].should == 'https://scholarsphere-test.dlt.psu.edu/'
   end
   it "should return the proper vhost on ss1stage" do
     Socket.stubs(:gethostname).returns('ss1stage')
-    ScholarSphere::Application.get_vhost_by_host[0].should == 'scholarsphere-staging.dlt.psu.edu'
-    ScholarSphere::Application.get_vhost_by_host[1].should == 'https://scholarsphere-staging.dlt.psu.edu/'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[0].should == 'scholarsphere-staging.dlt.psu.edu'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[1].should == 'https://scholarsphere-staging.dlt.psu.edu/'
   end
   it "should return the proper vhost on dev" do
     Socket.stubs(:gethostname).returns('some1host')
-    ScholarSphere::Application.get_vhost_by_host[0].should == 'some1host'
-    ScholarSphere::Application.get_vhost_by_host[1].should == 'https://some1host/'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[0].should == 'some1host'
+    Sufia::HttpHeaderAuth.get_vhost_by_host(Sufia.config)[1].should == 'https://some1host/'
   end
 end

data/spec/controllers/batch_controller_spec.rb

@@ -31,7 +31,7 @@ describe BatchController 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')
@@ -44,14 +44,14 @@ describe BatchController do
     end
     it "should equeue a batch update job" do
       params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}
-      Resque.expects(:enqueue).with(BatchUpdateJob, @user.login, params, params['generic_file']).once
+      Resque.expects(:enqueue).with(BatchUpdateJob, @user.user_key, params, params['generic_file']).once
       post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}     
     end
     describe "when views are shown" do
       render_views
       it "should show flash messages" do
         post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"","read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
-        response.should redirect_to dashboard_path
+        response.should redirect_to @routes.url_helpers.dashboard_path
         flash[:notice].should_not be_nil
         flash[:notice].should_not be_empty
         flash[:notice].should include("Your files are being processed")
@@ -63,7 +63,7 @@ describe BatchController do
         file = GenericFile.find(@file.pid)
         file.read_users.should == ['archivist1', 'archivist2']
 
-        response.should redirect_to dashboard_path
+        response.should redirect_to @routes.url_helpers.dashboard_path
       end
       it "should set the groups with read access" do
         post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
@@ -118,10 +118,10 @@ describe BatchController do
       @b1 = Batch.new
       @b1.save
       @file = GenericFile.new(:batch=>@b1, :label=>'f1')
-      @file.apply_depositor_metadata(@user.login)
+      @file.apply_depositor_metadata(@user.user_key)
       @file.save
       @file2 = GenericFile.new(:batch=>@b1, :label=>'f2')
-      @file2.apply_depositor_metadata(@user.login)
+      @file2.apply_depositor_metadata(@user.user_key)
       @file2.save
       controller.stubs(:params).returns({id:@b1.id})
     end

data/spec/controllers/catalog_controller_spec.rb

@@ -47,6 +47,8 @@ describe CatalogController do
       it "should find pdf files" do
         response.should be_success
         response.should render_template('catalog/index')
+        assigns(:document_list).map(&:id) == [@gf1.id]
+        
         assigns(:document_list).count.should eql(1)
         assigns(:document_list)[0].fetch(:generic_file__title_t)[0].should eql('Test Document PDF')
       end

data/spec/controllers/dashboard_controller_spec.rb

@@ -22,16 +22,18 @@ describe DashboardController do
   end
   # This doesn't really belong here, but it works for now
   describe "authenticate!" do
-    before(:each) do
-      @user = FactoryGirl.find_or_create(:archivist)
-      request.stubs(:headers).returns('REMOTE_USER' => @user.login).at_least_once
-      @strategy = Devise::Strategies::HttpHeaderAuthenticatable.new(nil)
-      @strategy.expects(:request).returns(request).at_least_once
-    end
-    after(:each) do
-      @user.delete
-    end
+    # move to scholarsphere
+    # before(:each) do
+    #   @user = FactoryGirl.find_or_create(:archivist)
+    #   request.stubs(:headers).returns('REMOTE_USER' => @user.login).at_least_once
+    #   @strategy = Devise::Strategies::HttpHeaderAuthenticatable.new(nil)
+    #   @strategy.expects(:request).returns(request).at_least_once
+    # end
+    # after(:each) do
+    #   @user.delete
+    # end
     it "should populate LDAP attrs if user is new" do
+      pending "This should only be in scholarsphere"
       User.stubs(:find_by_login).with(@user.login).returns(nil)
       User.expects(:create).with(login: @user.login).returns(@user).once
       User.any_instance.expects(:populate_attributes).once
@@ -41,6 +43,7 @@ describe DashboardController do
       get :index
     end
     it "should not populate LDAP attrs if user is not new" do
+      pending "This should only be in scholarsphere"
       User.stubs(:find_by_login).with(@user.login).returns(@user)
       User.expects(:create).with(login: @user.login).never
       User.any_instance.expects(:populate_attributes).never
@@ -66,7 +69,7 @@ describe DashboardController do
         response.should render_template('dashboard/index')
       end
       it "should return an array of documents I can edit" do
-        @user_results = Blacklight.solr.find Hash[:fq=>["edit_access_group_t:public OR edit_access_person_t:#{@user.login}"]]
+        @user_results = Blacklight.solr.find Hash[:fq=>["edit_access_group_t:public OR edit_access_person_t:#{@user.user_key}"]]
         assigns(:document_list).count.should eql(@user_results.docs.count)
       end
     end

data/spec/controllers/downloads_controller_spec.rb

@@ -18,16 +18,16 @@ describe DownloadsController do
 
   before(:all) do
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-    f = GenericFile.new(:pid => 'scholarsphere:test1')
-    f.apply_depositor_metadata('archivist1')
+    f = GenericFile.new(:pid => 'sufia:test1')
+    f.apply_depositor_metadata('archivist1@example.com')
     f.set_title_and_label('world.png')
-    f.add_file_datastream(File.new(Rails.root + 'spec/fixtures/world.png'), :dsid=>'content', :mimeType => 'image/png')
+    f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content', :mimeType => 'image/png')
     f.expects(:characterize_if_changed).yields
     f.save
   end
 
   after(:all) do
-    GenericFile.find('scholarsphere:test1').delete
+    GenericFile.find('sufia:test1').delete
   end
 
   describe "routing" do
@@ -50,28 +50,28 @@ describe DownloadsController do
       it "should default to returning configured default download" do
         DownloadsController.default_content_dsid.should == "content"
         controller.stubs(:render)
-        expected_content = ActiveFedora::Base.find("scholarsphere:test1").content.content
+        expected_content = ActiveFedora::Base.find("sufia:test1").content.content
         controller.expects(:send_data).with(expected_content, {:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
         get "show", :id => "test1"
         response.should be_success
       end
       it "should return requested datastreams" do
         controller.stubs(:render)
-        expected_content = ActiveFedora::Base.find("scholarsphere:test1").descMetadata.content
+        expected_content = ActiveFedora::Base.find("sufia:test1").descMetadata.content
         controller.expects(:send_data).with(expected_content, {:filename => 'descMetadata', :disposition => 'inline', :type => "text/plain"})
         get "show", :id => "test1", :datastream_id => "descMetadata"
         response.should be_success
       end
       it "should support setting disposition to inline" do
         controller.stubs(:render)
-        expected_content = ActiveFedora::Base.find("scholarsphere:test1").content.content
+        expected_content = ActiveFedora::Base.find("sufia:test1").content.content
         controller.expects(:send_data).with(expected_content, {:filename => 'world.png', :type => 'image/png', :disposition => "inline"})
         get "show", :id => "test1", :disposition => "inline"
         response.should be_success
       end
       it "should allow you to specify filename for download" do
         controller.stubs(:render)
-        expected_content = ActiveFedora::Base.find("scholarsphere:test1").content.content
+        expected_content = ActiveFedora::Base.find("sufia:test1").content.content
         controller.expects(:send_data).with(expected_content, {:filename => "my%20dog.png", :disposition => 'inline', :type => 'image/png'}) 
         get "show", :id => "test1", "filename" => "my%20dog.png"
       end

data/spec/controllers/generic_files_controller_spec.rb

@@ -16,8 +16,7 @@ require 'spec_helper'
 
 describe GenericFilesController do
   before do
-    Hydra::LDAP.connection.stubs(:get_operation_result).returns(OpenStruct.new({code:0, message:"Success"}))
-    Hydra::LDAP.stubs(:does_user_exist?).returns(true)
+    controller.stubs(:has_access?).returns(true)
 
     GenericFile.any_instance.stubs(:terms_of_service).returns('1')
     @user = FactoryGirl.find_or_create(:user)
@@ -41,19 +40,19 @@ describe GenericFilesController do
     end
 
     it "should spawn a content deposit event job" do
-      GenericFile.any_instance.stubs(:to_solr).returns({})
+      #GenericFile.any_instance.stubs(:to_solr).returns({})
       file = fixture_file_upload('/world.png','image/png')
-      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser')
+      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser@example.com')
       Resque.expects(:enqueue).with(CharacterizeJob, 'test:123')
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
     end
 
     it "should expand zip files" do
-      GenericFile.any_instance.stubs(:to_solr).returns({})
+      #GenericFile.any_instance.stubs(:to_solr).returns({})
       file = fixture_file_upload('/world.png','application/zip')
       Resque.expects(:enqueue).with(CharacterizeJob, 'test:123')
       Resque.expects(:enqueue).with(UnzipJob, 'test:123')
-      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser')
+      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser@example.com')
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
     end
 
@@ -76,22 +75,22 @@ describe GenericFilesController do
     end
 
     it "should record what user created the first version of content" do
-      GenericFile.any_instance.stubs(:to_solr).returns({})
+      #GenericFile.any_instance.stubs(:to_solr).returns({})
       file = fixture_file_upload('/world.png','image/png')
       xhr :post, :create, :files=>[file], :Filename=>"The world", :terms_of_service=>"1"
 
       saved_file = GenericFile.find('test:123')
       version = saved_file.content.latest_version
       version.versionID.should == "content.0"
-      saved_file.content.version_committer(version).should == @user.login
+      saved_file.content.version_committer(version).should == @user.user_key
     end
 
     it "should create batch associations from batch_id" do
-      Rails.application.config.stubs(:id_namespace).returns('sample')
+      Sufia::Engine.config.stubs(:id_namespace).returns('sample')
       file = fixture_file_upload('/world.png','image/png')
       controller.stubs(:add_posted_blob_to_asset)
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
-      lambda {Batch.find("sample:batch_id")}.should raise_error(ActiveFedora::ObjectNotFoundError) # The controller shouldn't actually save the Batch
+      lambda {Batch.find("sample:batch_id")}.should raise_error(ActiveFedora::ObjectNotFoundError) # The controller shouldn't actually save the Batch, but it should write the batch id to the files.
       b = Batch.create(pid: "sample:batch_id")
       b.generic_files.first.pid.should == "test:123"
     end
@@ -102,18 +101,23 @@ describe GenericFilesController do
 
       saved_file = GenericFile.find('test:123')
       # This is confirming that apply_depositor_metadata recorded the depositor
-      saved_file.properties.depositor.should == ['jilluser']
-      saved_file.depositor.should == 'jilluser'
+      #TODO make sure this is moved to scholarsphere:
+      #saved_file.properties.depositor.should == ['jilluser']
+      saved_file.properties.depositor.should == ['jilluser@example.com']
+      #TODO make sure this is moved to scholarsphere:
+      #saved_file.depositor.should == 'jilluser'
+      saved_file.depositor.should == 'jilluser@example.com'
       saved_file.properties.to_solr.keys.should include('depositor_t')
-      saved_file.properties.to_solr['depositor_t'].should == ['jilluser']
+      #TODO make sure this is moved to scholarsphere:
+      #saved_file.properties.to_solr['depositor_t'].should == ['jilluser']
+      saved_file.properties.to_solr['depositor_t'].should == ['jilluser@example.com']
       saved_file.to_solr.keys.should include('depositor_t')
-      saved_file.to_solr['depositor_t'].should == ['jilluser']
+      saved_file.to_solr['depositor_t'].should == ['jilluser@example.com']
     end
     it "Should call virus check" do
-      GenericFile.any_instance.stubs(:to_solr).returns({})
       controller.expects(:virus_check).returns(0)      
       file = fixture_file_upload('/world.png','image/png')
-      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser')
+      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser@example.com')
       Resque.expects(:enqueue).with(CharacterizeJob, 'test:123')
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
     end
@@ -146,9 +150,9 @@ describe GenericFilesController do
 
   describe "audit" do
     before do
-      GenericFile.any_instance.stubs(:to_solr).returns({})
+      #GenericFile.any_instance.stubs(:to_solr).returns({})
       @generic_file = GenericFile.new
-      @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.apply_depositor_metadata('mjg36')
       @generic_file.save
     end
@@ -159,7 +163,7 @@ describe GenericFilesController do
       xhr :post, :audit, :id=>@generic_file.pid
       response.should be_success
       lambda { JSON.parse(response.body) }.should_not raise_error
-      audit_results = JSON.parse(response.body).collect { |result| result["checksum_audit_log"]["pass"] }
+      audit_results = JSON.parse(response.body).collect { |result| result["pass"] }
       audit_results.reduce(true) { |sum, value| sum && value }.should be_true
     end
   end
@@ -167,9 +171,8 @@ describe GenericFilesController do
   describe "destroy" do
     before(:each) do
       GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-      GenericFile.any_instance.stubs(:to_solr).returns({})
       @generic_file = GenericFile.new
-      @generic_file.apply_depositor_metadata(@user.login)
+      @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
@@ -183,7 +186,7 @@ describe GenericFilesController do
       lambda { GenericFile.find(@generic_file.pid) }.should raise_error(ActiveFedora::ObjectNotFoundError)
     end
     it "should spawn a content delete event job" do
-      Resque.expects(:enqueue).with(ContentDeleteEventJob, @generic_file.noid, @user.login)
+      Resque.expects(:enqueue).with(ContentDeleteEventJob, @generic_file.noid, @user.user_key)
       delete :destroy, :id=>@generic_file.pid
     end
   end
@@ -193,7 +196,7 @@ describe GenericFilesController do
       GenericFile.any_instance.stubs(:terms_of_service).returns('1')
       #controller.expects(:virus_check).returns(0)      
       @generic_file = GenericFile.new
-      @generic_file.apply_depositor_metadata(@user.login)
+      @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
     end
     after do
@@ -201,7 +204,7 @@ describe GenericFilesController do
     end
 
     it "should spawn a content update event job" do
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser')
+      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser@example.com')
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
       post :update, :id=>@generic_file.pid, :generic_file=>{:terms_of_service=>"1", :title=>'new_title', :tag=>[''], :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
@@ -209,7 +212,7 @@ describe GenericFilesController do
     end
 
     it "should spawn a content new version event job" do
-      Resque.expects(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, 'jilluser')
+      Resque.expects(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, 'jilluser@example.com')
       Resque.expects(:enqueue).with(CharacterizeJob, @generic_file.pid)      
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
@@ -220,25 +223,23 @@ describe GenericFilesController do
     end
 
     it "should record what user added a new version" do
-      GenericFile.any_instance.stubs(:to_solr).returns({})
-      
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
 
       file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:terms_of_service=>"1", :tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:terms_of_service=>"1", :tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
 
       posted_file = GenericFile.find(@generic_file.pid)
       version1 = posted_file.content.latest_version
-      posted_file.content.version_committer(version1).should == @user.login
+      posted_file.content.version_committer(version1).should == @user.user_key
 
-      # other user uploads new version
+      # other user uploads new version 
+      # TODO this should be a separate test
       archivist = FactoryGirl.find_or_create(:archivist)
       controller.stubs(:current_user).returns(archivist)
-      sign_in archivist
 
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser').never
-      Resque.expects(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, archivist.login).once
+      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser@example.com').never
+      Resque.expects(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, archivist.user_key).once
       Resque.expects(:enqueue).with(CharacterizeJob, @generic_file.pid).once
       file = fixture_file_upload('/image.jp2','image/jp2')
       post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:terms_of_service=>"1", :tag=>[''] }
@@ -246,13 +247,13 @@ describe GenericFilesController do
       edited_file = GenericFile.find(@generic_file.pid)
       version2 = edited_file.content.latest_version
       version2.versionID.should_not == version1.versionID
-      edited_file.content.version_committer(version2).should == archivist.login
+      edited_file.content.version_committer(version2).should == archivist.user_key
 
       # original user restores his or her version
       controller.stubs(:current_user).returns(@user)
       sign_in @user
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser').never
-      Resque.expects(:enqueue).with(ContentRestoredVersionEventJob, @generic_file.pid, @user.login, 'content.0').once
+      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser@example.com').never
+      Resque.expects(:enqueue).with(ContentRestoredVersionEventJob, @generic_file.pid, @user.user_key, 'content.0').once
       Resque.expects(:enqueue).with(CharacterizeJob, @generic_file.pid).once
       post :update, :id=>@generic_file.pid, :revision=>'content.0', :generic_file=>{:terms_of_service=>"1", :tag=>['']}
 
@@ -260,7 +261,7 @@ describe GenericFilesController do
       version3 = restored_file.content.latest_version
       version3.versionID.should_not == version2.versionID
       version3.versionID.should_not == version1.versionID
-      restored_file.content.version_committer(version3).should == @user.login
+      restored_file.content.version_committer(version3).should == @user.user_key
       @user.delete
     end
 
@@ -268,7 +269,7 @@ describe GenericFilesController do
       post :update, :id=>@generic_file.pid, :generic_file=>{:terms_of_service=>"1", :tag=>[''], :permissions=>{:new_group_name=>{'group1'=>'read'}, :new_user_name=>{'user1'=>'edit'}}}
 
       assigns[:generic_file].read_groups.should == ["group1"]
-      assigns[:generic_file].edit_users.should include("user1", @user.login)
+      assigns[:generic_file].edit_users.should include("user1", @user.user_key)
     end
     it "should update existing groups and users" do
       @generic_file.read_groups = ['group3']
@@ -280,7 +281,7 @@ describe GenericFilesController do
     it "should spawn a virus check" do
       # The expectation is in the begin block
       controller.expects(:virus_check).returns(0)      
-      Resque.stubs(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, 'jilluser')
+      Resque.stubs(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, 'jilluser@example.com')
       Resque.stubs(:enqueue).with(CharacterizeJob, @generic_file.pid)
       GenericFile.stubs(:save).returns({})
       @user = FactoryGirl.find_or_create(:user)
@@ -294,10 +295,10 @@ describe GenericFilesController do
   describe "someone elses files" do
     before(:all) do
       GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-      f = GenericFile.new(:pid => 'scholarsphere:test5')
-      f.apply_depositor_metadata('archivist1')
+      f = GenericFile.new(:pid => 'sufia:test5')
+      f.apply_depositor_metadata('archivist1@example.com')
       f.set_title_and_label('world.png')
-      f.add_file_datastream(File.new(Rails.root +  'spec/fixtures/world.png'))
+      f.add_file_datastream(File.new(fixture_path +  '/world.png'))
       # grant public read access explicitly
       f.read_groups = ['public']
       f.expects(:characterize_if_changed).yields
@@ -305,12 +306,12 @@ describe GenericFilesController do
       @file = f
     end
     after(:all) do
-      GenericFile.find('scholarsphere:test5').delete
+      GenericFile.find('sufia:test5').delete
     end
     describe "edit" do
       it "should give me a flash error" do
         get :edit, id:"test5"
-        response.should redirect_to(:action => 'show')
+        response.should redirect_to @routes.url_helpers.generic_file_path('test5')
         flash[:alert].should_not be_nil
         flash[:alert].should_not be_empty
         flash[:alert].should include("You do not have sufficient privileges to edit this document")
@@ -354,6 +355,7 @@ describe GenericFilesController do
           @ds = @file.datastreams.first
           AuditJob.perform(@file.pid, @ds[0], @ds[1].versionID)
           get :show, id:"test5"
+          assigns[:notify_number].should == 1
           response.body.should include('<span id="notify_number" class="overlay"> 1</span>') # notify should be 1 for failing job
           @archivist.mailbox.inbox[0].messages[0].subject.should == "Failing Audit Run"
         end