sufia 0.0.1.pre2 → 0.0.1

data/solr_conf/solr.xml

@@ -28,7 +28,7 @@
   adminPath: RequestHandler path to manage cores.  
     If 'null' (or absent), cores will not be manageable via REST
   -->
-  <cores adminPath="/admin/cores">
+  <cores adminPath="/admin/cores" defaultCoreName="development">
     <core name="development" instanceDir="development-core" />
     <core name="test" instanceDir="test-core" />
   </cores>

data/spec/active_fedora/unsaved_digital_object_spec.rb

@@ -21,7 +21,7 @@ describe ActiveFedora::UnsavedDigitalObject do
     Sufia::IdService.valid?(@obj.pid).should be_true
   end
   it "should not use Fedora's pid service" do
-    ActiveFedora::RubydoraConnection.any_instance.expects(:nextid).never
+    ActiveFedora::RubydoraConnection.any_instance.should_receive(:nextid).never
     @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id')
     @obj.save
   end
@@ -39,9 +39,9 @@ describe ActiveFedora::UnsavedDigitalObject do
   it "should not assign a pid that already exists in Fedora" do
     mock_pid = 'scholarsphere:ef12ef12f'
     unique_pid = 'scholarsphere:bb22bb22b'
-    Sufia::IdService.stubs(:next_id).returns(mock_pid, unique_pid)
-    ActiveFedora::Base.stubs(:exists?).with(mock_pid).returns(true)
-    ActiveFedora::Base.stubs(:exists?).with(unique_pid).returns(false)
+    Sufia::IdService.stub(:next_id).and_return(mock_pid, unique_pid)
+    ActiveFedora::Base.stub(:exists?).with(mock_pid).and_return(true)
+    ActiveFedora::Base.stub(:exists?).with(unique_pid).and_return(false)
     @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id')
     pid = @obj.assign_pid
     @obj.pid.should == unique_pid

data/spec/config/host_to_vhost_spec.rb

@@ -16,22 +16,22 @@ require 'spec_helper'
 
 describe 'host_to_vhost' do
   it "should return the proper vhost on fedora1test" do
-    Socket.stubs(:gethostname).returns('fedora1test')
+    Socket.stub(:gethostname).and_return('fedora1test')
     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')
+    Socket.stub(:gethostname).and_return('fedora2test')
     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')
+    Socket.stub(:gethostname).and_return('ss1stage')
     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')
+    Socket.stub(:gethostname).and_return('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

data/spec/controllers/authorities_controller_spec.rb

@@ -23,7 +23,7 @@ describe AuthoritiesController do
                    {:label => "Edgar", :uri => "http://example.org/edga"}, 
                    {:label => "Eddie", :uri => "http://example.org/edd"},
                    {:label => "Economics", :uri => "http://example.org/eco"}]
-      LocalAuthority.expects(:entries_by_term).returns(mock_hits)
+      LocalAuthority.should_receive(:entries_by_term).and_return(mock_hits)
       xhr :get, :query, :model=>"generic_files", :term=>"subject", :q=>"E"
       response.should be_success
       JSON.parse(response.body).count.should == 6

data/spec/controllers/batch_controller_spec.rb

@@ -16,12 +16,12 @@ require 'spec_helper'
 
 describe BatchController do
   before do
-    controller.stubs(:has_access?).returns(true)
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    controller.stub(:has_access?).and_return(true)
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
-    User.any_instance.stubs(:groups).returns([])
-    controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
+    User.any_instance.stub(:groups).and_return([])
+    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
   end
   after do
     @user.delete
@@ -44,14 +44,16 @@ 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.user_key, params, params['generic_file']).once
+      s1 = stub('one')
+      BatchUpdateJob.should_receive(:new).with(@user.user_key, params).and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).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 @routes.url_helpers.dashboard_path
+        response.should redirect_to @routes.url_helpers.dashboard_index_path
         flash[:notice].should_not be_nil
         flash[:notice].should_not be_empty
         flash[:notice].should include("Your files are being processed")
@@ -63,7 +65,7 @@ describe BatchController do
         file = GenericFile.find(@file.pid)
         file.read_users.should == ['archivist1', 'archivist2']
 
-        response.should redirect_to @routes.url_helpers.dashboard_path
+        response.should redirect_to @routes.url_helpers.dashboard_index_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"=>[""]}
@@ -113,8 +115,8 @@ describe BatchController do
   end
   describe "#edit" do
     before do
-      User.any_instance.stubs(:display_name).returns("Jill Z. User")
-      GenericFile.any_instance.stubs(:characterize_if_changed).yields
+      User.any_instance.stub(:display_name).and_return("Jill Z. User")
+      GenericFile.any_instance.stub(:characterize_if_changed).and_yield
       @b1 = Batch.new
       @b1.save
       @file = GenericFile.new(:batch=>@b1, :label=>'f1')
@@ -123,7 +125,7 @@ describe BatchController do
       @file2 = GenericFile.new(:batch=>@b1, :label=>'f2')
       @file2.apply_depositor_metadata(@user.user_key)
       @file2.save
-      controller.stubs(:params).returns({id:@b1.id})
+      controller.stub(:params).and_return({id:@b1.id})
     end
     after do
       @b1.delete

data/spec/controllers/catalog_controller_spec.rb

@@ -16,23 +16,23 @@ require 'spec_helper'
 
 describe CatalogController do
   before do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-    GenericFile.any_instance.stubs(:characterize_if_changed).yields
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
+    GenericFile.any_instance.stub(:characterize_if_changed).and_yield
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
-    User.any_instance.stubs(:groups).returns([])
-    controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
+    User.any_instance.stub(:groups).and_return([])
+    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
   end
   after do
     @user.delete
   end
   describe "#index" do
     before (:all) do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-      @gf1 =  GenericFile.new(title:'Test Document PDF', filename:'test.pdf', read_groups:['public'])
+      GenericFile.find_each { |f| f.delete }
+      @gf1 =  GenericFile.new(title:'Test Document PDF', filename:'test.pdf', read_groups:['public'], :terms_of_service=>'1')
       @gf1.apply_depositor_metadata('mjg36')
       @gf1.save
-      @gf2 =  GenericFile.new(title:'Test 2 Document', filename:'test2.doc', contributor:'Contrib1', read_groups:['public'])
+      @gf2 =  GenericFile.new(title:'Test 2 Document', filename:'test2.doc', contributor:'Contrib1', read_groups:['public'], :terms_of_service=>'1')
       @gf2.apply_depositor_metadata('mjg36')
       @gf2.save
     end
@@ -55,12 +55,12 @@ describe CatalogController do
     end
     describe "facet search" do
       before do
-        xhr :get, :index, :fq=>"{!raw f=generic_file__contributor_facet}Contrib1"
+        xhr :get, :index, :q=>"{f=generic_file__contributor_facet}Contrib1"
       end
       it "should find facet files" do
         response.should be_success
         response.should render_template('catalog/index')
-        assigns(:document_list).count.should eql(2)
+        assigns(:document_list).count.should eql(1)
       end
     end
   end
@@ -69,19 +69,19 @@ describe CatalogController do
     before do
       @gf1 = GenericFile.new(title:'Generic File 1', contributor:'contributor 1', resource_type:'type 1', read_groups:['public'])
       @gf1.apply_depositor_metadata('mjg36')
-      @gf1.save
+      @gf1.save!
       sleep 1 # make sure next file is not at the same time compare
       @gf2 = GenericFile.new(title:'Generic File 2', contributor:'contributor 2', resource_type:'type 2', read_groups:['public'])
       @gf2.apply_depositor_metadata('mjg36')
-      @gf2.save
+      @gf2.save!
       sleep 1 # make sure next file is not at the same time compare
       @gf3 = GenericFile.new(title:'Generic File 3', contributor:'contributor 3', resource_type:'type 3', read_groups:['public'])
       @gf3.apply_depositor_metadata('mjg36')
-      @gf3.save
+      @gf3.save!
       sleep 1 # make sure next file is not at the same time compare
       @gf4 = GenericFile.new(title:'Generic File 4', contributor:'contributor 4', resource_type:'type 4', read_groups:['public'])
       @gf4.apply_depositor_metadata('mjg36')
-      @gf4.save
+      @gf4.save!
       xhr :get, :recent
     end
 

data/spec/controllers/dashboard_controller_spec.rb

@@ -16,27 +16,27 @@ require 'spec_helper'
 
 describe DashboardController do
   before do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-    User.any_instance.stubs(:groups).returns([])
-    controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
+    User.any_instance.stub(:groups).and_return([])
+    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
   end
   # This doesn't really belong here, but it works for now
   describe "authenticate!" do
     # move to scholarsphere
     # before(:each) do
     #   @user = FactoryGirl.find_or_create(:archivist)
-    #   request.stubs(:headers).returns('REMOTE_USER' => @user.login).at_least_once
+    #   request.stub(:headers).and_return('REMOTE_USER' => @user.login).at_least(:once)
     #   @strategy = Devise::Strategies::HttpHeaderAuthenticatable.new(nil)
-    #   @strategy.expects(:request).returns(request).at_least_once
+    #   @strategy.should_receive(:request).and_return(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
+      User.stub(:find_by_login).with(@user.login).and_return(nil)
+      User.should_receive(:create).with(login: @user.login).and_return(@user).once
+      User.any_instance.should_receive(:populate_attributes).once
       @strategy.should be_valid
       @strategy.authenticate!.should == :success
       sign_in @user
@@ -44,9 +44,9 @@ describe DashboardController do
     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
+      User.stub(:find_by_login).with(@user.login).and_return(@user)
+      User.should_receive(:create).with(login: @user.login).never
+      User.any_instance.should_receive(:populate_attributes).never
       @strategy.should be_valid
       @strategy.authenticate!.should == :success
       sign_in @user
@@ -57,8 +57,8 @@ describe DashboardController do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)
       sign_in @user
-      controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
-      User.any_instance.stubs(:groups).returns([])
+      controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+      User.any_instance.stub(:groups).and_return([])
     end
     describe "#index" do
       before (:each) do
@@ -69,8 +69,8 @@ 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.user_key}"]]
-        assigns(:document_list).count.should eql(@user_results.docs.count)
+        @user_results = Blacklight.solr.get "select", :params=>{:fq=>["edit_access_group_t:public OR edit_access_person_t:#{@user.user_key}"]}
+        assigns(:document_list).count.should eql(@user_results["response"]["numFound"])
       end
     end
   end

data/spec/controllers/downloads_controller_spec.rb

@@ -17,12 +17,12 @@ require 'spec_helper'
 describe DownloadsController do
 
   before(:all) do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     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(fixture_path + '/world.png'), :dsid=>'content', :mimeType => 'image/png')
-    f.expects(:characterize_if_changed).yields
+    f.should_receive(:characterize_if_changed).and_yield
     f.save
   end
 
@@ -39,8 +39,8 @@ describe DownloadsController do
   describe "when logged in as reader" do
     before do
       sign_in FactoryGirl.find_or_create(:archivist)
-      User.any_instance.stubs(:groups).returns([])
-      controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
+      User.any_instance.stub(:groups).and_return([])
+      controller.stub(:clear_session_user) ## Don't clear out the authenticated session
     end
     after do
       arch = FactoryGirl.find(:archivist) rescue
@@ -49,30 +49,30 @@ describe DownloadsController do
     describe "show" do
       it "should default to returning configured default download" do
         DownloadsController.default_content_dsid.should == "content"
-        controller.stubs(:render)
+        controller.stub(:render)
         expected_content = ActiveFedora::Base.find("sufia:test1").content.content
-        controller.expects(:send_data).with(expected_content, {:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
+        controller.should_receive(: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)
+        controller.stub(:render)
         expected_content = ActiveFedora::Base.find("sufia:test1").descMetadata.content
-        controller.expects(:send_data).with(expected_content, {:filename => 'descMetadata', :disposition => 'inline', :type => "text/plain"})
+        controller.should_receive(: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)
+        controller.stub(:render)
         expected_content = ActiveFedora::Base.find("sufia:test1").content.content
-        controller.expects(:send_data).with(expected_content, {:filename => 'world.png', :type => 'image/png', :disposition => "inline"})
+        controller.should_receive(: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)
+        controller.stub(:render)
         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'}) 
+        controller.should_receive(:send_data).with(expected_content, {:filename => "my%20dog.png", :disposition => 'inline', :type => 'image/png'}) 
         get "show", :id => "test1", "filename" => "my%20dog.png"
       end
     end
@@ -81,8 +81,8 @@ describe DownloadsController do
   describe "when not logged in as reader" do
     before do
       sign_in FactoryGirl.find_or_create(:user)
-      User.any_instance.stubs(:groups).returns([])
-      controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
+      User.any_instance.stub(:groups).and_return([])
+      controller.stub(:clear_session_user) ## Don't clear out the authenticated session
     end
     after do
       user = FactoryGirl.find(:user) rescue

data/spec/controllers/generic_files_controller_spec.rb

@@ -16,20 +16,20 @@ require 'spec_helper'
 
 describe GenericFilesController do
   before do
-    controller.stubs(:has_access?).returns(true)
+    controller.stub(:has_access?).and_return(true)
 
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
-    User.any_instance.stubs(:groups).returns([])
-    controller.stubs(:clear_session_user) ## Don't clear out the authenticated session
+    User.any_instance.stub(:groups).and_return([])
+    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
   end
   describe "#create" do
     before do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       @file_count = GenericFile.count
       @mock = GenericFile.new({:pid => 'test:123'})
-      GenericFile.stubs(:new).returns(@mock)
+      GenericFile.stub(:new).and_return(@mock)
     end
     after do
       begin
@@ -40,19 +40,31 @@ describe GenericFilesController do
     end
 
     it "should spawn a content deposit event job" do
-      #GenericFile.any_instance.stubs(:to_solr).returns({})
       file = fixture_file_upload('/world.png','image/png')
-      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser@example.com')
-      Resque.expects(:enqueue).with(CharacterizeJob, 'test:123')
+      s1 = stub('one')
+      ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
       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({})
       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@example.com')
+      s1 = stub('one')
+      ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
+
+      s3 = stub('one')
+      UnzipJob.should_receive(:new).with('test:123').and_return(s3)
+      Sufia.queue.should_receive(:push).with(s3).once
+
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
     end
 
@@ -75,7 +87,7 @@ 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.stub(:to_solr).and_return({})
       file = fixture_file_upload('/world.png','image/png')
       xhr :post, :create, :files=>[file], :Filename=>"The world", :terms_of_service=>"1"
 
@@ -86,9 +98,9 @@ describe GenericFilesController do
     end
 
     it "should create batch associations from batch_id" do
-      Sufia::Engine.config.stubs(:id_namespace).returns('sample')
+      Sufia::Engine.config.stub(:id_namespace).and_return('sample')
       file = fixture_file_upload('/world.png','image/png')
-      controller.stubs(:add_posted_blob_to_asset)
+      controller.stub(: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, but it should write the batch id to the files.
       b = Batch.create(pid: "sample:batch_id")
@@ -115,10 +127,16 @@ describe GenericFilesController do
       saved_file.to_solr['depositor_t'].should == ['jilluser@example.com']
     end
     it "Should call virus check" do
-      controller.expects(:virus_check).returns(0)      
+      controller.should_receive(:virus_check).and_return(0)      
       file = fixture_file_upload('/world.png','image/png')
-      Resque.expects(:enqueue).with(ContentDepositEventJob, 'test:123', 'jilluser@example.com')
-      Resque.expects(:enqueue).with(CharacterizeJob, 'test:123')
+
+      s1 = stub('one')
+      ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
     end
 
@@ -137,8 +155,8 @@ describe GenericFilesController do
         Object.send(:remove_const, :ClamAV) if @stubbed_clamav
       end
       it "failing virus check should create flash" do
-        GenericFile.any_instance.stubs(:to_solr).returns({})
-        ClamAV.any_instance.expects(:scanfile).returns(1)      
+        GenericFile.any_instance.stub(:to_solr).and_return({})
+        ClamAV.any_instance.should_receive(:scanfile).and_return(1)      
         file = fixture_file_upload('/world.png','image/png')
         controller.send :virus_check, file
         flash[:error].should_not be_empty
@@ -150,7 +168,7 @@ describe GenericFilesController do
 
   describe "audit" do
     before do
-      #GenericFile.any_instance.stubs(:to_solr).returns({})
+      #GenericFile.any_instance.stub(:to_solr).and_return({})
       @generic_file = GenericFile.new
       @generic_file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @generic_file.apply_depositor_metadata('mjg36')
@@ -170,7 +188,7 @@ describe GenericFilesController do
 
   describe "destroy" do
     before(:each) do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       @generic_file = GenericFile.new
       @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
@@ -186,15 +204,17 @@ 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.user_key)
+      s1 = stub('one')
+      ContentDeleteEventJob.should_receive(:new).with(@generic_file.noid, @user.user_key).and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
       delete :destroy, :id=>@generic_file.pid
     end
   end
 
   describe "update" do
     before do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-      #controller.expects(:virus_check).returns(0)      
+      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
+      #controller.should_receive(:virus_check).and_return(0)      
       @generic_file = GenericFile.new
       @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
@@ -204,7 +224,9 @@ describe GenericFilesController do
     end
 
     it "should spawn a content update event job" do
-      Resque.expects(:enqueue).with(ContentUpdateEventJob, @generic_file.pid, 'jilluser@example.com')
+      s1 = stub('one')
+      ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
       @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'}}}
@@ -212,8 +234,12 @@ describe GenericFilesController do
     end
 
     it "should spawn a content new version event job" do
-      Resque.expects(:enqueue).with(ContentNewVersionEventJob, @generic_file.pid, 'jilluser@example.com')
-      Resque.expects(:enqueue).with(CharacterizeJob, @generic_file.pid)      
+      s1 = stub('one')
+      ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
 
@@ -236,11 +262,17 @@ describe GenericFilesController do
       # other user uploads new version 
       # TODO this should be a separate test
       archivist = FactoryGirl.find_or_create(:archivist)
-      controller.stubs(:current_user).returns(archivist)
+      controller.stub(:current_user).and_return(archivist)
+
+      ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').never
+
+      s1 = stub('one')
+      ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, archivist.user_key).and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).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
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).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=>[''] }
 
@@ -250,11 +282,16 @@ describe GenericFilesController do
       edited_file.content.version_committer(version2).should == archivist.user_key
 
       # original user restores his or her version
-      controller.stubs(:current_user).returns(@user)
+      controller.stub(:current_user).and_return(@user)
       sign_in @user
-      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
+      ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').never
+      s1 = stub('one')
+      ContentRestoredVersionEventJob.should_receive(:new).with(@generic_file.pid, @user.user_key, 'content.0').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
       post :update, :id=>@generic_file.pid, :revision=>'content.0', :generic_file=>{:terms_of_service=>"1", :tag=>['']}
 
       restored_file = GenericFile.find(@generic_file.pid)
@@ -280,10 +317,15 @@ describe GenericFilesController do
     end
     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@example.com')
-      Resque.stubs(:enqueue).with(CharacterizeJob, @generic_file.pid)
-      GenericFile.stubs(:save).returns({})
+      controller.should_receive(:virus_check).and_return(0)      
+      s1 = stub('one')
+      ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1).once
+
+      s2 = stub('one')
+      CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2).once
+      GenericFile.stub(:save).and_return({})
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
       file = fixture_file_upload('/world.png','image/png')
@@ -294,14 +336,14 @@ describe GenericFilesController do
 
   describe "someone elses files" do
     before(:all) do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       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(fixture_path +  '/world.png'))
       # grant public read access explicitly
       f.read_groups = ['public']
-      f.expects(:characterize_if_changed).yields
+      f.should_receive(:characterize_if_changed).and_yield
       f.save
       @file = f
     end
@@ -334,7 +376,7 @@ describe GenericFilesController do
         flash[:alert].should include("You need to sign in or sign up before continuing")
       end
       it "should filter flash if they signin" do
-        request.env['warden'].stubs(:user).returns(@user)
+        request.env['warden'].stub(:user).and_return(@user)
         sign_out @user
         get :new
         sign_in @user
@@ -343,7 +385,7 @@ describe GenericFilesController do
       end
       describe "failing audit" do
         before(:all) do
-          ActiveFedora::RelsExtDatastream.any_instance.stubs(:dsChecksumValid).returns(false)
+          ActiveFedora::RelsExtDatastream.any_instance.stub(:dsChecksumValid).and_return(false)
           @archivist = FactoryGirl.find_or_create(:archivist)
         end
         after(:all) do
@@ -353,7 +395,7 @@ describe GenericFilesController do
           sign_out @user
           sign_in @archivist
           @ds = @file.datastreams.first
-          AuditJob.perform(@file.pid, @ds[0], @ds[1].versionID)
+          AuditJob.new(@file.pid, @ds[0], @ds[1].versionID).run
           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