sufia 4.0.1 → 4.1.0

data/spec/controllers/homepage_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HomepageController do
+describe HomepageController, :type => :controller do
   routes { Rails.application.class.routes }
 
   describe "#index" do

data/spec/controllers/mailbox_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MailboxController do
+describe MailboxController, :type => :controller do
   before(:each) do
     @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
@@ -8,7 +8,7 @@ describe MailboxController do
     @subject = "Test Subject"
     @rec1 = @another_user.send_message(@user, @message, @subject)
     @rec2 = @user.send_message(@another_user, @message, @subject)
-    MailboxController.any_instance.stub(:authenticate_user!).and_return(true)
+    allow_any_instance_of(MailboxController).to receive(:authenticate_user!).and_return(true)
     sign_in @user
   end
   after(:each) do
@@ -18,10 +18,10 @@ describe MailboxController do
   describe "#index" do
     it "should show message" do
       get :index
-      response.should be_success
-      assigns[:messages].first.last_message.body.should == 'Test Message'
-      assigns[:messages].first.last_message.subject.should == 'Test Subject'
-      @user.mailbox.inbox(unread: true).count.should == 0
+      expect(response).to be_success
+      expect(assigns[:messages].first.last_message.body).to eq('Test Message')
+      expect(assigns[:messages].first.last_message.subject).to eq('Test Subject')
+      expect(@user.mailbox.inbox(unread: true).count).to eq(0)
     end
   end
   describe "#delete" do
@@ -29,7 +29,7 @@ describe MailboxController do
       rec = @another_user.send_message(@user, 'message 2', 'subject 2')
       expect {
         delete :destroy, id: rec.conversation.id
-        response.should redirect_to(@routes.url_helpers.notifications_path)
+        expect(response).to redirect_to(@routes.url_helpers.notifications_path)
       }.to change {@user.mailbox.inbox.count}.by(-1)
     end
     it "should not delete message" do
@@ -37,7 +37,7 @@ describe MailboxController do
       rec = @another_user.send_message(@curator, 'message 3', 'subject 3')
       expect {
         delete :destroy, id: rec.conversation.id
-        response.should redirect_to(@routes.url_helpers.notifications_path)
+        expect(response).to redirect_to(@routes.url_helpers.notifications_path)
       }.to_not change { @curator.mailbox.inbox.count}
     end
   end
@@ -45,9 +45,9 @@ describe MailboxController do
     it "should delete message" do
       rec1 = @another_user.send_message(@user, 'message 2', 'subject 2')
       rec2 = @another_user.send_message(@user, 'message 3', 'subject 3')
-      @user.mailbox.inbox.count.should == 3
+      expect(@user.mailbox.inbox.count).to eq(3)
       get :delete_all
-      @user.mailbox.inbox.count.should == 0
+      expect(@user.mailbox.inbox.count).to eq(0)
     end
   end
 end

data/spec/controllers/my/collections_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe My::CollectionsController do
+describe My::CollectionsController, :type => :controller do
   describe "logged in user" do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)

data/spec/controllers/my/files_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe My::FilesController do
+describe My::FilesController, :type => :controller do
 
   before :all do
     GenericFile.destroy_all

data/spec/controllers/my/highlights_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe My::HighlightsController do
+describe My::HighlightsController, :type => :controller do
   describe "logged in user" do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)

data/spec/controllers/my/shares_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe My::SharesController do
+describe My::SharesController, :type => :controller do
   describe "logged in user" do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)

data/spec/controllers/my_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe MyController do
+describe MyController, :type => :controller do
 
   it "sets the controller name" do
     expect(controller.controller_name).to eq :my

data/spec/controllers/pages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PagesController do
+describe PagesController, :type => :controller do
   let (:page_name) {"about_page"}
   context "content exists" do
     describe "GET #show" do

data/spec/controllers/single_use_links_controller_spec.rb

@@ -1,93 +1,89 @@
 require 'spec_helper'
 
-describe SingleUseLinksController do
-  before(:all) do
-    @user = FactoryGirl.find_or_create(:jill)
-    @file = GenericFile.new
-    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @file.apply_depositor_metadata(@user)
-    @file.save
-    @file2 = GenericFile.new
-    @file2.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @file2.apply_depositor_metadata('mjg36')
-    @file2.save
+describe SingleUseLinksController, :type => :controller do
+  let(:user) { FactoryGirl.find_or_create(:jill) }
+  let(:file) do
+    GenericFile.new.tap do |f|
+      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      f.apply_depositor_metadata(user)
+      f.save
+    end
   end
-  after(:all) do
-    @file.delete
-    @file2.delete
-    SingleUseLink.delete_all
+  let(:file2) do
+    GenericFile.new.tap do |f|
+      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      f.apply_depositor_metadata('mjg36')
+      f.save
+    end
   end
   before do
-    controller.stub(:has_access?).and_return(true)
-    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+    allow(controller).to receive(:has_access?).and_return(true)
+    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
+  end
+  after(:all) do
+    ActiveFedora::Base.destroy_all
+    SingleUseLink.destroy_all
   end
   describe "logged in user with edit permission" do
     before do
-      sign_in @user
+      sign_in user
       @now = DateTime.now
-      DateTime.stub(:now).and_return(@now)
-      @hash = "some-dummy-sha2-hash" 
-      Digest::SHA2.should_receive(:new).and_return(@hash)
+      allow(DateTime).to receive(:now).and_return(@now)
+      @hash = "some-dummy-sha2-hash"
+      allow(Digest::SHA2).to receive(:new).and_return(@hash)
     end
 
-    describe "GET 'download'" do
-      it "and_return http success" do
-        get 'new_download', id:@file.pid
-        response.should be_success
-        assigns[:link].should == @routes.url_helpers.download_single_use_link_path(@hash)
-      end
-
+    it "gets the download link" do
+      get 'new_download', id: file.pid
+      expect(response).to be_success
+      expect(assigns[:link]).to eq @routes.url_helpers.download_single_use_link_path(@hash)
     end
-  
-    describe "GET 'show'" do
-      it "and_return http success" do
-        get 'new_show', id:@file.pid
-        response.should be_success
-        assigns[:link].should == @routes.url_helpers.show_single_use_link_path(@hash)
-      end
 
-    end   
+    it "gets the show link" do
+      get 'new_show', id: file.pid
+      expect(response).to be_success
+      expect(assigns[:link]).to eq @routes.url_helpers.show_single_use_link_path(@hash)
+    end
   end
 
   describe "logged in user without edit permission" do
     before do
       @other_user = FactoryGirl.find_or_create(:archivist)
-      @file.read_users << @other_user
-      @file.save
       sign_in @other_user
+      file.read_users << @other_user
+      file.save
     end
 
     describe "GET 'download'" do
       it "and_return http success" do
-        get 'new_download', id:@file.pid
-        response.should_not be_success
+        get 'new_download', id: file.pid
+        expect(response).not_to be_success
       end
 
     end
 
     describe "GET 'show'" do
       it "and_return http success" do
-        get 'new_show', id:@file.pid
-        response.should_not be_success
+        get 'new_show', id: file.pid
+        expect(response).not_to be_success
       end
 
     end
   end
 
-  describe "unkown user" do
+  describe "unknown user" do
     describe "GET 'download'" do
       it "and_return http failure" do
-        get 'new_download', id:@file.pid
-        response.should_not be_success
+        get 'new_download', id: file.pid
+        expect(response).not_to be_success
       end
     end
-  
+
     describe "GET 'show'" do
       it "and_return http failure" do
-        get 'new_show', id:@file.pid
-        response.should_not be_success
+        get 'new_show', id: file.pid
+        expect(response).not_to be_success
       end
-    end   
+    end
   end
-
 end

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SingleUseLinksViewerController do
+describe SingleUseLinksViewerController, :type => :controller do
   before(:all) do
     @user = FactoryGirl.find_or_create(:jill)
     @file = GenericFile.new
@@ -18,8 +18,8 @@ describe SingleUseLinksViewerController do
     SingleUseLink.delete_all
   end
   before do
-    controller.stub(:has_access?).and_return(true)
-    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+    allow(controller).to receive(:has_access?).and_return(true)
+    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
   end
   
   describe "retrieval links" do
@@ -44,24 +44,24 @@ describe SingleUseLinksViewerController do
     end
     describe "GET 'download'" do
       it "and_return http success" do
-        controller.stub(:render)
+        allow(controller).to receive(:render)
         expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
-        controller.should_receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
+        expect(controller).to receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
         get :download, id:download_link_hash 
-        response.body.should == expected_content
-        response.should be_success
+        expect(response.body).to eq(expected_content)
+        expect(response).to be_success
       end
       it "and_return 404 on second attempt" do
         get :download, id:download_link_hash
-        response.should be_success
+        expect(response).to be_success
         get :download, id:download_link_hash
-        response.should render_template('error/single_use_error') 
+        expect(response).to render_template('error/single_use_error') 
       end
       it "and_return 404 on attempt to get download with show" do
         get :download, id:download_link_hash
-        response.should be_success
+        expect(response).to be_success
         get :show, id:download_link_hash
-        response.should render_template('error/single_use_error')
+        expect(response).to render_template('error/single_use_error')
       end
     end
 
@@ -69,18 +69,18 @@ describe SingleUseLinksViewerController do
       it "and_return http success" do
 
         get 'show', id:show_link_hash
-        response.should be_success
-        assigns[:asset].pid.should == @file.pid
+        expect(response).to be_success
+        expect(assigns[:asset].pid).to eq(@file.pid)
       end
       it "and_return 404 on second attempt" do
         get :show, id:show_link_hash
-        response.should be_success
+        expect(response).to be_success
         get :show, id:show_link_hash
-        response.should render_template('error/single_use_error')
+        expect(response).to render_template('error/single_use_error')
       end
       it "and_return 404 on attempt to get show path with download hash" do
         get :show, id:download_link_hash
-        response.should render_template('error/single_use_error')
+        expect(response).to render_template('error/single_use_error')
       end
     end
   end

data/spec/controllers/static_controller_spec.rb

@@ -1,30 +1,30 @@
 require 'spec_helper'
 
-describe StaticController do
+describe StaticController, :type => :controller do
   routes { Sufia::Engine.routes }
   describe "#mendeley" do
     it "renders page" do
       get "mendeley"
-      response.should be_success
-      response.should render_template "layouts/homepage"
+      expect(response).to be_success
+      expect(response).to render_template "layouts/homepage"
     end
     it "renders no layout with javascript" do
       xhr :get, :mendeley
-      response.should be_success
-      response.should_not render_template "layouts/homepage"
+      expect(response).to be_success
+      expect(response).not_to render_template "layouts/homepage"
     end
   end
 
   describe "#zotero" do
     it "renders page" do
       get "zotero"
-      response.should be_success
-      response.should render_template "layouts/homepage"
+      expect(response).to be_success
+      expect(response).to render_template "layouts/homepage"
     end
     it "renders no layout with javascript" do
       xhr :get, :zotero
-      response.should be_success
-      response.should_not render_template "layouts/homepage"
+      expect(response).to be_success
+      expect(response).not_to render_template "layouts/homepage"
     end
   end
 end

data/spec/controllers/tinymce_assets_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TinymceAssetsController do
+describe TinymceAssetsController, :type => :controller do
   let(:file) { fixture_file_upload('/world.png','image/png') }
 
   context "when logged in" do

data/spec/controllers/transfers_controller_spec.rb

@@ -0,0 +1,212 @@
+require 'spec_helper'
+
+describe TransfersController, :type => :controller do
+  describe "with a signed in user" do
+    let(:another_user) { FactoryGirl.find_or_create(:jill) }
+    let(:user) { FactoryGirl.find_or_create(:archivist) }
+
+    before do
+      sign_in user
+    end
+
+    describe "#index" do
+      let!(:incoming_file) do
+        GenericFile.new.tap do |f|
+          f.apply_depositor_metadata(another_user.user_key)
+          f.save!
+          f.request_transfer_to(user)
+        end
+      end
+      let!(:outgoing_file) do
+        GenericFile.new.tap do |f|
+          f.apply_depositor_metadata(user.user_key)
+          f.save!
+          f.request_transfer_to(another_user)
+        end
+      end
+
+      it "is successful" do
+        get :index
+        expect(response).to be_success
+        expect(assigns[:incoming].first).to be_kind_of ProxyDepositRequest
+        expect(assigns[:incoming].first.pid).to eq(incoming_file.pid)
+        expect(assigns[:outgoing].first).to be_kind_of ProxyDepositRequest
+        expect(assigns[:outgoing].first.pid).to eq(outgoing_file.pid)
+      end
+
+      describe "When the incoming request is for a deleted file" do
+        before do
+          incoming_file.destroy
+        end
+        it "should not show that file" do
+          get :index
+          expect(response).to be_success
+          expect(assigns[:incoming]).to be_empty
+        end
+      end
+    end
+
+    describe "#new" do
+      let(:file) do
+        GenericFile.new.tap do |f|
+          f.apply_depositor_metadata(user.user_key)
+          f.save!
+        end
+      end
+      context 'when user is the depositor' do
+        it "should be successful" do
+          sign_in user
+          get :new, id: file
+          expect(response).to be_success
+          expect(assigns[:generic_file]).to eq(file)
+          expect(assigns[:proxy_deposit_request]).to be_kind_of ProxyDepositRequest
+          expect(assigns[:proxy_deposit_request].pid).to eq(file.pid)
+        end
+      end
+    end
+
+    describe "#create" do
+      let(:file) do
+        GenericFile.new.tap do |f|
+          f.apply_depositor_metadata(user.user_key)
+          f.save!
+        end
+      end
+      it "should be successful" do
+        allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
+        expect {
+          post :create, id: file.id, proxy_deposit_request: {transfer_to: another_user.user_key}
+        }.to change(ProxyDepositRequest, :count).by(1)
+        expect(response).to redirect_to @routes.url_helpers.transfers_path
+        expect(flash[:notice]).to eq('Transfer request created')
+        proxy_request = another_user.proxy_deposit_requests.first
+        expect(proxy_request.pid).to eq(file.pid)
+        expect(proxy_request.sending_user).to eq(user)
+        # AND A NOTIFICATION SHOULD HAVE BEEN CREATED
+        notification = another_user.reload.mailbox.inbox[0].messages[0]
+        expect(notification.subject).to eq("Ownership Change Request")
+        expect(notification.body).to eq("<a href=\"/users/#{user.user_key}\">#{user.name}</a> wants to transfer a file to you. Review all <a href=\"#{@routes.url_helpers.transfers_path}\">transfer requests</a>")
+      end
+      it "should give an error if the user is not found" do
+        expect {
+          post :create, id: file.id, proxy_deposit_request: {transfer_to: 'foo' }
+        }.not_to change(ProxyDepositRequest, :count)
+        expect(assigns[:proxy_deposit_request].errors[:transfer_to]).to eq(['must be an existing user'])
+        expect(response).to redirect_to(root_path)
+      end
+    end
+
+    describe "#accept" do
+      context "when I am the receiver" do
+        let!(:incoming_file) do
+          GenericFile.new.tap do |f|
+            f.apply_depositor_metadata(another_user.user_key)
+            f.save!
+            f.request_transfer_to(user)
+          end
+        end
+        it "should be successful when retaining access rights" do
+          put :accept, id: user.proxy_deposit_requests.first
+          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(flash[:notice]).to eq("Transfer complete")
+          expect(assigns[:proxy_deposit_request].status).to eq('accepted')
+          expect(incoming_file.reload.edit_users).to eq([another_user.user_key, user.user_key])
+        end
+        it "should be successful when resetting access rights" do
+          put :accept, id: user.proxy_deposit_requests.first, reset: true
+          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(flash[:notice]).to eq("Transfer complete")
+          expect(assigns[:proxy_deposit_request].status).to eq('accepted')
+          expect(incoming_file.reload.edit_users).to eq([user.user_key])
+        end
+        it "should handle sticky requests " do
+          put :accept, id: user.proxy_deposit_requests.first, sticky: true
+          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(flash[:notice]).to eq("Transfer complete")
+          expect(assigns[:proxy_deposit_request].status).to eq('accepted')
+          expect(user.can_receive_deposits_from).to include(another_user)
+        end
+      end
+
+      context "accepting one that isn't mine" do
+        let!(:incoming_file) do
+          GenericFile.new.tap do |f|
+            f.apply_depositor_metadata(user.user_key)
+            f.save!
+            f.request_transfer_to(another_user)
+          end
+        end
+        it "should not allow me" do
+          put :accept, id: another_user.proxy_deposit_requests.first
+          expect(response).to redirect_to root_path
+          expect(flash[:alert]).to eq("You are not authorized to access this page.")
+        end
+      end
+    end
+
+    describe "#reject" do
+      context "when I am the receiver" do
+        let!(:incoming_file) do
+          GenericFile.new.tap do |f|
+            f.apply_depositor_metadata(another_user.user_key)
+            f.save!
+            f.request_transfer_to(user)
+          end
+        end
+        it "should be successful" do
+          put :reject, id: user.proxy_deposit_requests.first
+          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(flash[:notice]).to eq("Transfer rejected")
+          expect(assigns[:proxy_deposit_request].status).to eq('rejected')
+        end
+      end
+
+      context "accepting one that isn't mine" do
+        let!(:incoming_file) do
+          GenericFile.new.tap do |f|
+            f.apply_depositor_metadata(user.user_key)
+            f.save!
+            f.request_transfer_to(another_user)
+          end
+        end
+        it "should not allow me" do
+          put :reject, id: another_user.proxy_deposit_requests.first
+          expect(response).to redirect_to root_path
+          expect(flash[:alert]).to eq("You are not authorized to access this page.")
+        end
+      end
+    end
+
+    describe "#destroy" do
+      context "when I am the sender" do
+        let!(:incoming_file) do
+          GenericFile.new.tap do |f|
+            f.apply_depositor_metadata(user.user_key)
+            f.save!
+            f.request_transfer_to(another_user)
+          end
+        end
+        it "should be successful" do
+          delete :destroy, id: another_user.proxy_deposit_requests.first
+          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(flash[:notice]).to eq("Transfer canceled")
+        end
+      end
+
+      context "accepting one that isn't mine" do
+        let!(:incoming_file) do
+          GenericFile.new.tap do |f|
+            f.apply_depositor_metadata(another_user.user_key)
+            f.save!
+            f.request_transfer_to(user)
+          end
+        end
+        it "should not allow me" do
+          delete :destroy, id: user.proxy_deposit_requests.first
+          expect(response).to redirect_to root_path
+          expect(flash[:alert]).to eq("You are not authorized to access this page.")
+        end
+      end
+    end
+  end
+end