sufia 4.0.0.beta2 → 4.0.0.beta3

data/spec/controllers/dashboard/collections_controller_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Dashboard::CollectionsController do
+  describe "logged in user" do
+    before (:each) do
+      @user = FactoryGirl.find_or_create(:archivist)
+      sign_in @user
+    end
+
+    describe "#index" do
+      before do
+        GenericFile.destroy_all
+        Collection.destroy_all
+        @my_file = FactoryGirl.create(:generic_file, depositor: @user)
+        @my_collection = Collection.new(title: "test collection").tap do |c|
+          c.apply_depositor_metadata(@user.user_key)
+          c.save!
+        end
+        @unrelated_collection = Collection.new(title: "test collection").tap do |c|
+          c.apply_depositor_metadata(FactoryGirl.create(:user).user_key)
+        end
+      end
+
+      it "should respond with success" do
+        get :index
+        expect(response).to be_successful
+        expect(response).to render_template('dashboard/lists/index')
+      end
+
+      it "sets the controller name" do
+        expect(controller.controller_name).to eq :dashboard
+      end
+
+      it "should paginate" do          
+        other_user = FactoryGirl.create(:user)
+        Collection.new(title: "test collection").tap do |c|
+          c.apply_depositor_metadata(@user.user_key)
+          c.save!
+        end
+        Collection.new(title: "test collection").tap do |c|
+          c.apply_depositor_metadata(@user.user_key)
+          c.save!
+        end
+        get :index, per_page: 2
+        expect(assigns[:document_list].length).to eq 2
+        get :index, per_page: 2, page: 2
+        expect(assigns[:document_list].length).to be >= 1
+      end
+
+      it "shows the correct collections" do
+        get :index
+        # shows my collections
+        expect(assigns[:document_list].map(&:id)).to include(@my_collection.id)
+        # doesn't show files
+        expect(assigns[:document_list].map(&:id)).to_not include(@my_file.id)
+        # doesn't show other users' collections" do
+        expect(assigns[:document_list].map(&:id)).to_not include(@unrelated_collection.id)
+      end
+    end
+  end
+
+  describe "not logged in as a user" do
+    describe "#index" do
+      it "should return an error" do
+        get :index
+        expect(response).to be_redirect
+      end
+    end
+  end
+end
+

data/spec/controllers/dashboard/files_controller_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Dashboard::FilesController do
+  describe "logged in user" do
+    before (:each) do
+      @user = FactoryGirl.find_or_create(:archivist)
+      sign_in @user
+    end
+
+    describe "#index" do
+      before do
+        GenericFile.destroy_all
+        Collection.destroy_all
+        @my_file = FactoryGirl.create(:generic_file, depositor: @user)
+        @my_collection = Collection.new(title: "test collection").tap do |c|
+          c.apply_depositor_metadata(@user.user_key)
+        end
+        @my_collection.save!
+        @shared_file = FactoryGirl.build(:generic_file).tap do |r|
+          r.apply_depositor_metadata FactoryGirl.create(:user)
+          r.edit_users += [@user.user_key]
+          r.save!
+        end
+        @unrelated_file = FactoryGirl.create(:generic_file, depositor: FactoryGirl.create(:user))
+        @wrong_type = Batch.create
+      end
+
+      it "should respond with success" do
+        get :index
+        expect(response).to be_successful
+        expect(response).to render_template('dashboard/lists/index')
+      end
+
+      it "sets the controller name" do
+        expect(controller.controller_name).to eq :dashboard
+      end
+
+      it "should paginate" do          
+        FactoryGirl.create(:generic_file)
+        FactoryGirl.create(:generic_file)
+        get :index, per_page: 2
+        expect(assigns[:document_list].length).to eq 2
+        get :index, per_page: 2, page: 2
+        expect(assigns[:document_list].length).to be >= 1
+      end
+
+      it "shows the correct files" do
+        get :index
+        # shows documents I deposited
+        expect(assigns[:document_list].map(&:id)).to include(@my_file.id)
+        # doesn't show collections
+        expect(assigns[:document_list].map(&:id)).to_not include(@my_collection.id)
+        # doesn't show shared files
+        expect(assigns[:document_list].map(&:id)).to_not include(@shared_file.id)
+        # doesn't show other users' files
+        expect(assigns[:document_list].map(&:id)).to_not include(@unrelated_file.id)
+        # doesn't show non-generic files
+        expect(assigns[:document_list].map(&:id)).to_not include(@wrong_type.id)
+      end
+    end
+  end
+
+  describe "not logged in as a user" do
+    describe "#index" do
+      it "should return an error" do
+        get :index
+        expect(response).to be_redirect
+      end
+    end
+  end
+end

data/spec/controllers/dashboard/highlights_controller_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Dashboard::HighlightsController do
+  describe "logged in user" do
+    before (:each) do
+      @user = FactoryGirl.find_or_create(:archivist)
+      sign_in @user
+    end
+
+    describe "#index" do
+      before do
+        GenericFile.destroy_all
+        Collection.destroy_all
+        @highlighted_file = FactoryGirl.create(:generic_file, depositor: @user)
+        @user.trophies.create(generic_file_id: @highlighted_file.id)
+        @normal_file = FactoryGirl.create(:generic_file, depositor: @user)
+        other_user = FactoryGirl.create(:user)
+        @unrelated_highlighted_file = FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata other_user
+          r.edit_users += [@user.user_key]
+          r.save!
+        end
+        other_user.trophies.create(generic_file_id: @unrelated_highlighted_file.id)
+      end
+
+      it "should respond with success" do
+        get :index
+        expect(response).to be_successful
+        expect(response).to render_template('dashboard/lists/index')
+      end
+
+      it "sets the controller name" do
+        expect(controller.controller_name).to eq :dashboard
+      end
+
+      it "should paginate" do          
+        @user.trophies.create(generic_file_id: FactoryGirl.create(:generic_file, depositor: @user).id)
+        @user.trophies.create(generic_file_id: FactoryGirl.create(:generic_file, depositor: @user).id)
+        get :index, per_page: 2
+        expect(assigns[:document_list].length).to eq 2
+        get :index, per_page: 2, page: 2
+        expect(assigns[:document_list].length).to be >= 1
+      end
+
+      it "shows the correct files" do
+        get :index
+        # shows documents I've highlighted
+        expect(assigns[:document_list].map(&:id)).to include(@highlighted_file.id)
+        # doesn't show non-highlighted files
+        expect(assigns[:document_list].map(&:id)).to_not include(@normal_file.id)
+        # doesn't show other users' highlighted files
+        expect(assigns[:document_list].map(&:id)).to_not include(@unrelated_highlighted_file.id)
+      end
+    end
+  end
+
+  describe "not logged in as a user" do
+    describe "#index" do
+      it "should return an error" do
+        get :index
+        expect(response).to be_redirect
+      end
+    end
+  end
+end
+

data/spec/controllers/dashboard/shares_controller_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe Dashboard::SharesController do
+  describe "logged in user" do
+    before (:each) do
+      @user = FactoryGirl.find_or_create(:archivist)
+      sign_in @user
+    end
+
+    describe "#index" do
+      before do
+        GenericFile.destroy_all
+        Collection.destroy_all
+        @other_user = FactoryGirl.create(:user)
+        @my_file = FactoryGirl.create(:generic_file, depositor: @user)
+        @unshared_file = FactoryGirl.create(:generic_file, depositor: @other_user)
+        @shared_with_me = FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata @other_user
+          r.edit_users += [@user.user_key]
+          r.save!
+        end
+        @shared_with_someone_else = FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata @user
+          r.edit_users += [@other_user.user_key]
+          r.save!
+        end
+      end
+
+      it "should respond with success" do
+        get :index
+        expect(response).to be_successful
+        expect(response).to render_template('dashboard/lists/index')
+      end
+
+      it "sets the controller name" do
+        expect(controller.controller_name).to eq :dashboard
+      end
+
+      it "should paginate" do          
+        FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata @other_user
+          r.edit_users += [@user.user_key]
+          r.save!
+        end
+        FactoryGirl.create(:generic_file).tap do |r|
+          r.apply_depositor_metadata @other_user
+          r.edit_users += [@user.user_key]
+          r.save!
+        end
+        get :index, per_page: 2
+        expect(assigns[:document_list].length).to eq 2
+        get :index, per_page: 2, page: 2
+        expect(assigns[:document_list].length).to be >= 1
+      end
+
+      it "shows the correct documents" do
+        get :index
+        # shows documents shared with me
+        expect(assigns[:document_list].map(&:id)).to include(@shared_with_me.id)
+        # doesn't show normal files
+        expect(assigns[:document_list].map(&:id)).to_not include(@my_file.id)
+        expect(assigns[:document_list].map(&:id)).to_not include(@unshared_file.id)
+        # doesn't show files shared with other users
+        expect(assigns[:document_list].map(&:id)).to_not include(@shared_with_someone_else.id)
+      end
+    end
+  end
+
+  describe "not logged in as a user" do
+    describe "#index" do
+      it "should return an error" do
+        get :index
+        expect(response).to be_redirect
+      end
+    end
+  end
+end
+

data/spec/controllers/dashboard_controller_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe DashboardController do
   before do
-    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
@@ -39,50 +38,4 @@ describe DashboardController do
       get :index
     end
   end
-  describe "logged in user" do
-    before (:each) do
-      @user = FactoryGirl.find_or_create(:archivist)
-      sign_in @user
-      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
-        xhr :get, :index
-        # Make sure there are at least 3 files owned by @user. Otherwise, the tests aren't meaningful.
-        if assigns(:document_list).count < 3
-          files_count = assigns(:document_list).count
-          until files_count == 3
-            gf = GenericFile.new()
-            gf.apply_depositor_metadata(@user)
-            gf.save
-            files_count += 1
-          end
-          xhr :get, :index
-        end
-      end
-      it "should be a success" do
-        response.should be_success
-        response.should render_template('dashboard/index')
-      end
-      it "should return an array of documents I can edit" do
-        editable_docs_response = ActiveFedora::SolrService.instance.conn.get "select", :params=>{:fq=>["edit_access_group_ssim:public OR edit_access_person_ssim:#{@user.user_key}"]}
-        assigns(:result_set_size).should eql(editable_docs_response["response"]["numFound"])
-        assigns(:document_list).each {|doc| doc.should be_kind_of SolrDocument}
-      end
-      it "should paginate" do          
-        xhr :get, :index, per_page: 2
-        response.should be_success
-        response.should render_template('dashboard/index')
-      end
-    end
-  end
-  describe "not logged in as a user" do
-    describe "#index" do
-      it "should return an error" do
-        xhr :post, :index
-        response.should_not be_success
-      end
-    end
-  end
 end

data/spec/controllers/downloads_controller_spec.rb

@@ -4,10 +4,9 @@ describe DownloadsController do
 
   describe "with a file" do
     before do
-      @f = GenericFile.new(:pid => 'sufia:test1')
+      @f = GenericFile.new(pid: 'sufia:test1')
       @f.apply_depositor_metadata('archivist1@example.com')
       @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      @f.should_receive(:characterize_if_changed).and_yield
       @f.save!
     end
 
@@ -26,24 +25,24 @@ describe DownloadsController do
           DownloadsController.default_content_dsid.should == "content"
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
-          controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
-          get "show", :id => "test1"
+          controller.should_receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
+          get "show", id: "test1"
           response.body.should == expected_content
           response.should be_success
         end
         it "should return requested datastreams" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).descMetadata.content
-          controller.should_receive(:send_file_headers!).with({:filename => 'descMetadata', :disposition => 'inline', :type => 'text/plain' })
-          get "show", :id => "test1", :datastream_id => "descMetadata"
+          controller.should_receive(:send_file_headers!).with({filename: 'descMetadata', disposition: 'inline', type: 'text/plain' })
+          get "show", id: "test1", datastream_id: "descMetadata"
           response.body.should == expected_content
           response.should be_success
         end
         it "should support setting disposition to inline" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
-          controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
-          get "show", :id => "test1", :disposition => "inline"
+          controller.should_receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
+          get "show", id: "test1", disposition: "inline"
           response.body.should == expected_content
           response.should be_success
         end
@@ -51,8 +50,8 @@ describe DownloadsController do
         it "should allow you to specify filename for download" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).content.content
-          controller.should_receive(:send_file_headers!).with({:filename => 'my%20dog.png', :disposition => 'inline', :type => 'image/png' })
-          get "show", :id => "test1", "filename" => "my%20dog.png"
+          controller.should_receive(:send_file_headers!).with({filename: 'my%20dog.png', disposition: 'inline', type: 'image/png' })
+          get "show", id: "test1", "filename" => "my%20dog.png"
           response.body.should == expected_content
         end
       end
@@ -67,7 +66,7 @@ describe DownloadsController do
 
       describe "show" do
         it "should deny access" do
-          get "show", :id => "test1"
+          get "show", id: "test1"
           response.should redirect_to root_path
           flash[:alert].should == 'You are not authorized to access this page.'
         end

data/spec/controllers/generic_files_controller_spec.rb

@@ -12,7 +12,7 @@ describe GenericFilesController do
   describe "#create" do
     before do
       @file_count = GenericFile.count
-      @mock = GenericFile.new({:pid => 'test:123'})
+      @mock = GenericFile.new({pid: 'test:123'})
       GenericFile.stub(:new).and_return(@mock)
     end
 
@@ -24,28 +24,28 @@ describe GenericFilesController do
 
     it "should render error the file wasn't actually a file" do
       file = 'hello'
-      xhr :post, :create, :files=>[file], :Filename=>"The World", :batch_id=>'sample:batch_id', :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
+      xhr :post, :create, files: [file], Filename: "The World", batch_id: 'sample:batch_id', permission: {"group"=>{"public"=>"read"} }, terms_of_service: '1'
       response.status.should == 422
       JSON.parse(response.body).first['error'].should match(/no file for upload/i)
     end
 
-    it "should spawn a content deposit event job" do
+    it "spawns a content deposit event job" do
       file = fixture_file_upload('/world.png','image/png')
       s1 = double('one')
-      ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
+      allow(ContentDepositEventJob).to receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
 
       s2 = double('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'
-      flash[:error].should be_nil
+      allow(CharacterizeJob).to receive(:new).with('test:123').and_return(s2)
+      expect(Sufia.queue).to 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'
+      expect(flash[:error]).to be_nil
     end
 
     it "displays a flash error when file has a virus" do
       file = fixture_file_upload('/world.png', 'image/png')
-      Sufia::GenericFile::Actions.should_receive(:virus_check).with(file.path).and_raise(Sufia::VirusFoundError.new('A virus was found'))
-      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
+      Sufia::GenericFile::Actor.should_receive(:virus_check).with(file.path).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+      xhr :post, :create, files: [file], Filename: "The world", batch_id: "sample:batch_id", permission: {"group"=>{"public"=>"read"} }, terms_of_service: '1'
       flash[:error].should_not be_blank
       flash[:error].should include('A virus was found')
     end
@@ -54,7 +54,7 @@ describe GenericFilesController do
       date_today = Date.today
       Date.stub(:today).and_return(date_today)
       file = fixture_file_upload('/world.png','image/png')
-      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
+      xhr :post, :create, files: [file], Filename: "The world", batch_id: "sample:batch_id", permission: {"group"=>{"public"=>"read"} }, terms_of_service: '1'
       response.should be_success
       GenericFile.count.should == @file_count + 1
 
@@ -73,7 +73,7 @@ describe GenericFilesController do
     it "should record what user created the first version of content" do
       #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"
+      xhr :post, :create, files: [file], Filename: "The world", terms_of_service: "1"
 
       saved_file = GenericFile.find('test:123')
       version = saved_file.content.latest_version
@@ -85,14 +85,14 @@ describe GenericFilesController do
       Sufia.config.stub(:id_namespace).and_return('sample')
       file = fixture_file_upload('/world.png','image/png')
       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"
+      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")
       b.generic_files.first.pid.should == "test:123"
     end
     it "should set the depositor id" do
       file = fixture_file_upload('/world.png','image/png')
-      xhr :post, :create, :files => [file], :Filename => "The world", :batch_id => "sample:batch_id", :permission => {"group"=>{"public"=>"read"} }, :terms_of_service => "1"
+      xhr :post, :create, files: [file], Filename: "The world", batch_id: "sample:batch_id", permission: {"group"=>{"public"=>"read"} }, terms_of_service: "1"
       response.should be_success
 
       saved_file = GenericFile.find('test:123')
@@ -115,11 +115,11 @@ describe GenericFilesController do
       GenericFile.any_instance.stub(:save).and_raise(RSolr::Error::Http.new({},{}))
 
       file = fixture_file_upload('/world.png','image/png')
-      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
+      xhr :post, :create, files: [file], Filename: "The world", batch_id: "sample:batch_id", permission: {"group"=>{"public"=>"read"} }, terms_of_service: "1"
       response.body.should include("Error occurred while creating generic file.")
     end
   end
-  
+
   describe "#create with browse-everything" do
     before do
       GenericFile.delete_all
@@ -128,14 +128,14 @@ describe GenericFilesController do
     it "should ingest files from provide URLs" do
       ImportUrlJob.should_receive(:new).twice {"ImportJob"}
       Sufia.queue.should_receive(:push).with("ImportJob").twice
-      lambda { post :create, selected_files: @json_from_browse_everything, :batch_id => "sample:batch_id"}.should change(GenericFile, :count).by(2)
+      lambda { post :create, selected_files: @json_from_browse_everything, batch_id: "sample:batch_id"}.should change(GenericFile, :count).by(2)
       created_files = GenericFile.all
       ["https://dl.dropbox.com/fake/Getting%20Started.pdf", "https://dl.dropbox.com/fake/filepicker-demo.txt.txt"].each do |url|
-        created_files.map {|f| f.import_url}.should include(url)  
+        created_files.map {|f| f.import_url}.should include(url)
       end
-    end    
+    end
   end
-  
+
   describe "#create with local_file" do
     let (:mock_url) {"http://example.com"}
     before do
@@ -220,7 +220,7 @@ describe GenericFilesController do
       @generic_file.delete
     end
     it "should return json with the result" do
-      xhr :post, :audit, :id=>@generic_file.pid
+      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["pass"] }
@@ -241,14 +241,14 @@ describe GenericFilesController do
     end
     it "should delete the file" do
       GenericFile.find(@generic_file.pid).should_not be_nil
-      delete :destroy, :id=>@generic_file.pid
+      delete :destroy, id: @generic_file.pid
       lambda { GenericFile.find(@generic_file.pid) }.should raise_error(ActiveFedora::ObjectNotFoundError)
     end
     it "should spawn a content delete event job" do
       s1 = double('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
+      delete :destroy, id: @generic_file.pid
     end
   end
 
@@ -277,8 +277,15 @@ describe GenericFilesController do
         allow(mock_query).to receive(:map).and_return(mock_query.for_path.map(&:marshal_dump))
         profile = double('profile')
         allow(profile).to receive(:pageview).and_return(mock_query)
-        allow(Sufia::UsageStatistics).to receive(:profile).and_return(profile)
-       end
+        allow(Sufia::Analytics).to receive(:profile).and_return(profile)
+
+        download_query = double('query')
+        allow(download_query).to receive(:for_file).and_return([
+          OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:123456789", totalEvents: "3")
+        ])
+        allow(download_query).to receive(:map).and_return(download_query.for_file.map(&:marshal_dump))
+        allow(profile).to receive(:download).and_return(download_query)
+      end
 
       it 'renders the stats view' do
         get :stats, id: @generic_file.noid
@@ -301,38 +308,41 @@ describe GenericFilesController do
   end
 
   describe "update" do
-    before do
-      @generic_file = GenericFile.new
-      @generic_file.apply_depositor_metadata(@user)
-      @generic_file.save
+    let(:generic_file) do
+      GenericFile.new.tap do |gf|
+        gf.apply_depositor_metadata(@user)
+        gf.save!
+      end
     end
+
     after do
-      @generic_file.delete
+      generic_file.destroy
     end
 
     it "should spawn a content update event job" do
       s1 = double('one')
-      ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
+      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(:jill)
       sign_in @user
-      post :update, :id=>@generic_file.pid, :generic_file=>{:title=>'new_title', :tag=>[''], :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
+      post :update, id: generic_file, generic_file: {title: 'new_title', tag: [''], permissions: { new_user_name: {'archivist1'=>'edit'}}}
       @user.delete
     end
 
-    it "should spawn a content new version event job" do
+    it "spawns a content new version event job" do
       s1 = double('one')
-      ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
+      allow(ContentNewVersionEventJob).to receive(:new).with(generic_file.pid, 'jilluser@example.com').and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
+
       s2 = double('one')
-      CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
-      Sufia.queue.should_receive(:push).with(s2).once
+      allow(CharacterizeJob).to receive(:new).with(generic_file.pid).and_return(s2)
+      expect(Sufia.queue).to receive(:push).with(s2).once
       @user = FactoryGirl.find_or_create(:jill)
       sign_in @user
 
-      file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
-      @user.delete
+      file = fixture_file_upload('/world.png', 'image/png')
+      post :update, id: generic_file, filedata: file, generic_file: {tag: [''], permissions: { new_user_name: {archivist1: 'edit' } } }
+      @user.destroy
     end
 
     it "should change mime type when restoring a revision with a different mime type" do
@@ -340,23 +350,23 @@ describe GenericFilesController do
       sign_in @user
 
       file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
+      post :update, id: generic_file, filedata: file, generic_file: { tag: [''], permissions: { new_user_name: { 'archivist1@example.com'=>'edit' } } }
 
-      posted_file = GenericFile.find(@generic_file.pid)
+      posted_file = GenericFile.find(generic_file.pid)
       version1 = posted_file.content.latest_version
       posted_file.content.version_committer(version1).should == @user.user_key
 
       file = fixture_file_upload('/image.jpg','image/jpg')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
+      post :update, id: generic_file, filedata: file, generic_file: { tag: [''], permissions: { new_user_name: { 'archivist1@example.com'=>'edit' } } }
 
-      posted_file = GenericFile.find(@generic_file.pid)
+      posted_file = GenericFile.find(generic_file.pid)
       version2 = posted_file.content.latest_version
       posted_file.content.version_committer(version2).should == @user.user_key
 
       posted_file.content.mimeType.should == "image/jpeg"
-      post :update, :id=>@generic_file.pid, :revision=>'content.0'
+      post :update, id: generic_file, revision: 'content.0'
 
-      restored_file = GenericFile.find(@generic_file.pid)
+      restored_file = GenericFile.find(generic_file.pid)
       version3 = restored_file.content.latest_version
       version3.versionID.should_not == version2.versionID
       version3.versionID.should_not == version1.versionID
@@ -365,117 +375,136 @@ describe GenericFilesController do
       @user.delete
     end
 
-    it "should record what user added a new version" do
-      @user = FactoryGirl.find_or_create(:jill)
-      sign_in @user
+    context "when two users edit a file" do
+      let(:archivist) { FactoryGirl.find_or_create(:archivist) }
+      let(:user) { FactoryGirl.find_or_create(:jill) }
+      let(:generic_file) do
+        GenericFile.new.tap do |gf|
+          gf.apply_depositor_metadata(user)
+          gf.edit_users = [user.user_key, archivist.user_key]
+          gf.save!
+        end
+      end
+      before do
+        allow_any_instance_of(Sufia::GenericFile::Actor).to receive(:push_characterize_job)
+        sign_in user
+      end
 
-      file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
+      it "records which user added a new version" do
+        file = fixture_file_upload('/world.png','image/png')
+        post :update, id: generic_file, filedata: file
 
-      posted_file = GenericFile.find(@generic_file.pid)
-      version1 = posted_file.content.latest_version
-      posted_file.content.version_committer(version1).should == @user.user_key
+        posted_file = GenericFile.find(generic_file.pid)
+        version1 = posted_file.content.latest_version
+        expect(posted_file.content.version_committer(version1)).to eq(user.user_key)
 
-      # other user uploads new version
-      # TODO this should be a separate test
-      archivist = FactoryGirl.find_or_create(:archivist)
-      controller.stub(:current_user).and_return(archivist)
+        # other user uploads new version
+        # TODO this should be a separate test
+        allow(controller).to receive(:current_user).and_return(archivist)
+        # reset controller:
+        controller.instance_variable_set(:@actor, nil)
 
-      ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').never
+        expect(ContentUpdateEventJob).to receive(:new).with(generic_file.pid, 'jilluser@example.com').never
 
-      s1 = double('one')
-      ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, archivist.user_key).and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
+        s1 = double('one')
+        allow(ContentNewVersionEventJob).to receive(:new).with(generic_file.pid, archivist.user_key).and_return(s1)
+        expect(Sufia.queue).to receive(:push).with(s1).once
 
-      s2 = double('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.jpg','image/jpg')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world"
+        file = fixture_file_upload('/image.jpg', 'image/jpg')
+        post :update, id: generic_file, filedata: file
 
-      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.user_key
+        edited_file = generic_file.reload
+        version2 = edited_file.content.latest_version
+        expect(version2.versionID).not_to eq(version1.versionID)
+        expect(edited_file.content.version_committer(version2)).to eq(archivist.user_key)
 
-      # original user restores his or her version
-      controller.stub(:current_user).and_return(@user)
-      sign_in @user
-      ContentUpdateEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').never
-      s1 = double('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
+        # original user restores his or her version
+        allow(controller).to receive(:current_user).and_return(user)
+        sign_in user
+        expect(ContentUpdateEventJob).to receive(:new).with(generic_file.pid, 'jilluser@example.com').never
+        s1 = double('one')
+        allow(ContentRestoredVersionEventJob).to receive(:new).with(generic_file.pid, user.user_key, 'content.0').and_return(s1)
+        expect(Sufia.queue).to receive(:push).with(s1).once
 
-      s2 = double('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'
+        # reset controller:
+        controller.instance_variable_set(:@actor, nil)
 
-      restored_file = GenericFile.find(@generic_file.pid)
-      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.user_key
-      @user.delete
+        post :update, id: generic_file, revision: 'content.0'
+
+        restored_file = generic_file.reload
+        version3 = restored_file.content.latest_version
+        expect(version3.versionID).not_to eq(version2.versionID)
+        expect(version3.versionID).not_to eq(version1.versionID)
+        expect(restored_file.content.version_committer(version3)).to eq(user.user_key)
+      end
     end
 
-    it "should add a new groups and users" do
-      post :update, :id=>@generic_file.pid, :generic_file=>{:tag=>[''], :permissions=>{:new_group_name=>{'group1'=>'read'}, :new_user_name=>{'user1'=>'edit'}}}
+    it "should add new groups and users" do
+      post :update, id: generic_file, generic_file: { 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.user_key)
     end
     it "should update existing groups and users" do
-      @generic_file.read_groups = ['group3']
-      @generic_file.save
-      post :update, :id=>@generic_file.pid, :generic_file=>{:tag=>[''], :permissions=>{:new_group_name=>'', :new_group_permission=>'', :new_user_name=>'', :new_user_permission=>'', :group=>{'group3' =>'read'}}}
+      generic_file.read_groups = ['group3']
+      generic_file.save
+      post :update, id: generic_file, generic_file: { tag: [''], permissions:
+        { new_group_name: '', new_group_permission: '', new_user_name: '', new_user_permission: '', group: { 'group3' => 'read' }}}
 
       assigns[:generic_file].read_groups.should == ["group3"]
     end
-    it "should spawn a virus check" do
-      # The expectation is in the begin block
-      Sufia::GenericFile::Actions.should_receive(:virus_check).and_return(0)
+
+    it "spawns a virus check" do
       s1 = double('one')
-      ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
+      allow(ContentNewVersionEventJob).to receive(:new).with(generic_file.pid, 'jilluser@example.com').and_return(s1)
+      expect(Sufia.queue).to receive(:push).with(s1).once
 
       s2 = double('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({})
+      allow(CharacterizeJob).to receive(:new).with(generic_file.pid).and_return(s2)
+      allow(CreateDerivativesJob).to receive(:new).with(generic_file.pid).and_return(s2)
       @user = FactoryGirl.find_or_create(:jill)
       sign_in @user
-      file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
+      file = fixture_file_upload('/world.png', 'image/png')
+      expect(Sufia::GenericFile::Actor).to receive(:virus_check).and_return(0)
+      expect(Sufia.queue).to receive(:push).with(s2).once
+      post :update, id: generic_file.pid, filedata: file, 'Filename' => 'The world', generic_file: { tag: [''], permissions: { new_user_name: { archivist1: 'edit' } } }
     end
 
-    it "should go back to edit on an error" do
-      GenericFile.any_instance.should_receive(:valid?).and_return(false)
-      post :update, :id=>@generic_file.pid, :generic_file=>{:tag=>['']}
-      response.should be_successful
-      response.should render_template('edit')
-      assigns[:generic_file].should == @generic_file
+    context "when there's an error saving" do
+      let!(:generic_file) do
+        GenericFile.new.tap do |gf|
+          gf.apply_depositor_metadata(@user)
+          gf.save!
+        end
+      end
+      it "redirects to edit" do
+        GenericFile.any_instance.should_receive(:valid?).and_return(false)
+        post :update, id: generic_file, generic_file: {:tag=>['']}
+        response.should be_successful
+        response.should render_template('edit')
+        expect(assigns[:generic_file]).to eq generic_file
+      end
     end
-
   end
 
   describe "someone elses files" do
     before do
-      f = GenericFile.new(:pid => 'sufia:test5')
+      f = GenericFile.new(pid: 'sufia:test5')
       f.apply_depositor_metadata('archivist1@example.com')
       f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       # grant public read access explicitly
       f.read_groups = ['public']
-      f.should_receive(:characterize_if_changed).and_yield
       f.save
       @file = f
+      allow_any_instance_of(Sufia::GenericFile::Actor).to receive(:push_characterize_job)
     end
     after do
       GenericFile.find('sufia:test5').destroy
     end
     describe "edit" do
       it "should give me a flash error" do
-        get :edit, id:"test5"
+        get :edit, id: "test5"
         response.should redirect_to @routes.url_helpers.generic_file_path('test5')
         flash[:alert].should_not be_nil
         flash[:alert].should_not be_empty
@@ -484,8 +513,8 @@ describe GenericFilesController do
     end
     describe "view" do
       it "should show me the file" do
-        get :show, id:"test5"
-        response.should_not redirect_to(:action => 'show')
+        get :show, id: "test5"
+        response.should_not redirect_to(action: 'show')
         flash[:alert].should be_nil
       end
     end
@@ -499,7 +528,7 @@ describe GenericFilesController do
       end
       it "should filter flash if they signin" do
         sign_in @user
-        get :show, id:"test5"
+        get :show, id: "test5"
         flash[:alert].should be_nil
       end
       describe "failing audit" do
@@ -511,7 +540,7 @@ describe GenericFilesController do
           sign_in @archivist
           @ds = @file.datastreams.first
           AuditJob.new(@file.pid, @ds[0], @ds[1].versionID).run
-          get :show, id:"test5"
+          get :show, id: "test5"
           assigns[:notify_number].should == 1
           @archivist.mailbox.inbox[0].messages[0].subject.should == "Failing Audit Run"
         end