sufia 6.0.0.rc4 → 6.0.0

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,28 +1,25 @@
 require 'spec_helper'
 
 describe DashboardController, :type => :controller do
-  
   context "with an unauthenticated user" do
-
     it "redirects to sign-in page" do
       get :index
       expect(response).to be_redirect
       expect(flash[:alert]).to eq("You need to sign in or sign up before continuing.")
     end
-
   end
 
   context "with an authenticated user" do
+    let(:user) { FactoryGirl.find_or_create(:user_with_mail) }
 
     before do
-      @user = FactoryGirl.find_or_create(:user_with_mail)
-      sign_in @user
+      sign_in user
     end
 
     it "renders the dashboard with the user's info" do
       get :index
       expect(response).to be_successful
-      expect(assigns(:user)).to eq(@user)
+      expect(assigns(:user)).to eq(user)
     end
 
     it "gathers the user's recent activity" do
@@ -35,12 +32,49 @@ describe DashboardController, :type => :controller do
       expect(assigns(:notifications)).to be_truthy
     end
 
-    context "with activities" do
+    context 'with transfers' do
+      let(:another_user) { FactoryGirl.find_or_create(:archivist) }
+      context 'when incoming' 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 'assigns an instance variable' do
+          get :index
+          expect(response).to be_success
+          expect(assigns[:incoming].first).to be_kind_of ProxyDepositRequest
+          expect(assigns[:incoming].first.generic_file_id).to eq(incoming_file.id)
+        end
+      end
+
+      context 'when outgoing' do
+        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 'assigns an instance variable' do
+          get :index
+          expect(response).to be_success
+          expect(assigns[:outgoing].first).to be_kind_of ProxyDepositRequest
+          expect(assigns[:outgoing].first.generic_file_id).to eq(outgoing_file.id)
+        end
+     end
+    end
 
+    context "with activities" do
       let(:activity) { double }
+
       before do
         allow(activity).to receive(:map).and_return(activity)
-        expect_any_instance_of(User).to receive(:get_all_user_activity).and_return(activity)
+        allow_any_instance_of(User).to receive(:get_all_user_activity).and_return(activity)
       end
 
       it "gathers the user's recent activity within the default amount of time" do
@@ -51,10 +85,7 @@ describe DashboardController, :type => :controller do
       it "returns results in JSON" do
         get :activity
         expect(response).to be_successful
-      end 
-
+      end
     end
-
   end
-
 end

data/spec/controllers/generic_files_controller_spec.rb

@@ -44,7 +44,7 @@ describe GenericFilesController do
         it "spawns a content deposit event job" do
           expect_any_instance_of(Sufia::GenericFile::Actor).to receive(:create_content).with(file, 'world.png', 'content', 'image/png').and_return(true)
           xhr :post, :create, files: [file], 'Filename' => 'The world', batch_id: batch_id, permission: {group: { public: 'read' } }, terms_of_service: '1'
-          expect(response.body).to eq '[{"name":null,"size":"","url":"/files/test123","thumbnail_url":"test123","delete_url":"deleteme","delete_type":"DELETE"}]'
+          expect(response.body).to eq '[{"name":null,"size":null,"url":"/files/test123","thumbnail_url":"test123","delete_url":"deleteme","delete_type":"DELETE"}]'
           expect(flash[:error]).to be_nil
         end
 
@@ -563,4 +563,27 @@ describe GenericFilesController do
       expect(user.mailbox.inbox[0].messages[0].subject).to eq "Test subject"
     end
   end
+
+  describe "batch creation" do
+    context "when uploading a file" do 
+      let(:batch_id) { Sufia::IdService.mint }
+      let(:file1) { fixture_file_upload('/world.png','image/png') }
+      let(:file2) { fixture_file_upload('/image.jpg','image/png') }
+
+      it "should not create the batch on HTTP GET " do
+        expect(Batch).to_not receive(:create)
+        xhr :get, :new 
+        expect(response).to be_success
+      end
+
+      it "should create the batch on HTTP POST with multiple files" do
+        expect(GenericFile).to receive(:new).twice
+        expect(Batch).to receive(:find_or_create).twice
+        xhr :post, :create, files: [file1], Filename: 'The world 1', batch_id: batch_id, on_behalf_of: 'carolyn', terms_of_service: '1'
+        expect(response).to be_success
+        xhr :post, :create, files: [file2], Filename: 'An image', batch_id: batch_id, on_behalf_of: 'carolyn', terms_of_service: '1'
+        expect(response).to be_success
+      end
+    end  
+  end
 end

data/spec/controllers/transfers_controller_spec.rb

@@ -29,9 +29,9 @@ describe TransfersController, :type => :controller 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.id)
+        expect(assigns[:incoming].first.generic_file_id).to eq(incoming_file.id)
         expect(assigns[:outgoing].first).to be_kind_of ProxyDepositRequest
-        expect(assigns[:outgoing].first.pid).to eq(outgoing_file.id)
+        expect(assigns[:outgoing].first.generic_file_id).to eq(outgoing_file.id)
       end
 
       describe "When the incoming request is for a deleted file" do
@@ -60,7 +60,7 @@ describe TransfersController, :type => :controller do
           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.id)
+          expect(assigns[:proxy_deposit_request].generic_file_id).to eq(file.id)
         end
       end
     end
@@ -80,7 +80,7 @@ describe TransfersController, :type => :controller do
         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.id)
+        expect(proxy_request.generic_file_id).to eq(file.id)
         expect(proxy_request.sending_user).to eq(user)
         # AND A NOTIFICATION SHOULD HAVE BEEN CREATED
         notification = another_user.reload.mailbox.inbox[0].messages[0]

data/spec/controllers/users_controller_spec.rb

@@ -103,10 +103,24 @@ describe UsersController, :type => :controller do
 
     context "when user attempts to edit another profile" do
       let(:another_user) { FactoryGirl.create(:user) }
-      it "redirects to show profile" do
-        get :edit, id: another_user.user_key
-        expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
-        expect(flash[:alert]).to include("Permission denied: cannot access this page.")
+      context 'with default abilities' do
+        it "redirects to show profile" do
+          expect_any_instance_of(Ability).to receive(:can?).with(:edit, another_user).and_return(false)
+          get :edit, id: another_user.to_param
+          expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+          expect(flash[:alert]).to include("Permission denied: cannot access this page.")
+        end
+      end
+      context 'with a custom ability' do
+        before do
+          allow_any_instance_of(Ability).to receive(:can?).with(:edit, another_user).and_return(true)
+        end
+        it "allows user to edit another user's profile" do
+          get :edit, id: another_user.to_param
+          expect(response).to be_success
+          expect(response).not_to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+          expect(flash[:alert]).to be_nil
+        end
       end
     end
 

data/spec/helpers/dashboard_helper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe DashboardHelper, :type => :helper do
-  
+
   describe "#render_recent_activity" do
     context "when there is no activity" do
       it "should return a messages stating the user has no recent activity" do

data/spec/helpers/sufia_url_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe SufiaUrlHelper do
+  let(:document) { SolrDocument.new(id: 'foo123') }
+
+  describe "#track_collection_path" do
+    subject { helper.track_collection_path(document) }
+    it { is_expected.to eq '/catalog/foo123/track' }
+  end
+
+  describe "#track_generic_file_path" do
+    subject { helper.track_generic_file_path(document) }
+    it { is_expected.to eq '/catalog/foo123/track' }
+  end
+end

data/spec/inputs/select_with_help_input_spec.rb

@@ -14,3 +14,18 @@ describe 'SelectWithHelpInput', type: :input do
   end
 end
 
+describe 'SelectWithHelpInput File Edit', type: :input do
+  let(:user) { FactoryGirl.find_or_create(:jill) }
+  let(:file) { GenericFile.create(batch: Batch.create, label: 'f1') { |f| f.apply_depositor_metadata(user) } }
+  let(:form) { Sufia::Forms::GenericFileEditForm.new(file) }
+  let(:base_options) { { as: :select_with_help, collection: Sufia.config.resource_types,
+                         input_html: { class: 'form-control', multiple: true } } }
+  let(:options) { base_options }
+
+  subject { input_for form, :resource_type, options }
+
+  it "should not be required by default" do
+      expect(subject).to have_selector 'select'
+      expect(subject).not_to match /required/
+  end
+end

data/spec/jobs/{active_fedora_pid_based_job_spec.rb → active_fedora_id_based_job_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveFedoraPidBasedJob do
+describe ActiveFedoraIdBasedJob do
   let (:user) {FactoryGirl.find_or_create(:jill)}
   let (:file) {GenericFile.new.tap do |gf|
                   gf.apply_depositor_metadata(user)
@@ -8,7 +8,7 @@ describe ActiveFedoraPidBasedJob do
                 end}
 
   it "finds object" do
-    job = ActiveFedoraPidBasedJob.new(file.id)
+    job = ActiveFedoraIdBasedJob.new(file.id)
     expect(job.generic_file).to_not be_nil
   end
 end

data/spec/jobs/audit_job_spec.rb

@@ -59,8 +59,8 @@ describe AuditJob do
 
   describe "run_audit" do
     let(:uri) { file.content.versions.first.uri }
-    let!(:old) { ChecksumAuditLog.create(pid: file.id, dsid: 'content', version: uri, pass: 1, created_at: 2.minutes.ago) }
-    let!(:new) { ChecksumAuditLog.create(pid: file.id, dsid: 'content', version: uri, pass: 0) }
+    let!(:old) { ChecksumAuditLog.create(generic_file_id: file.id, dsid: 'content', version: uri, pass: 1, created_at: 2.minutes.ago) }
+    let!(:new) { ChecksumAuditLog.create(generic_file_id: file.id, dsid: 'content', version: uri, pass: 0) }
     let(:mock_service) { double('mock fixity check service') }
 
     before do

data/spec/lib/sufia/id_service_spec.rb

@@ -14,18 +14,18 @@ describe Sufia::IdService do
       expect(Sufia::IdService.valid?(subject)).to be true
     end
 
-    context "when the pid already exists in Fedora" do
-      let(:mock_pid) { 'ef12ef12f' }
-      let(:unique_pid) { 'bb22bb22b' }
+    context "when the id already exists in Fedora" do
+      let(:mock_id) { 'ef12ef12f' }
+      let(:unique_id) { 'bb22bb22b' }
 
       before do
-        allow(Sufia::IdService).to receive(:next_id).and_return(mock_pid, unique_pid)
-        expect(ActiveFedora::Base).to receive(:exists?).with(mock_pid).and_return(true)
-        expect(ActiveFedora::Base).to receive(:exists?).with(unique_pid).and_return(false)
+        allow(Sufia::IdService).to receive(:next_id).and_return(mock_id, unique_id)
+        expect(ActiveFedora::Base).to receive(:exists?).with(mock_id).and_return(true)
+        expect(ActiveFedora::Base).to receive(:exists?).with(unique_id).and_return(false)
       end
 
-      it "should not assign that pid again" do
-        expect(subject).to eq unique_pid
+      it "should not assign that id again" do
+        expect(subject).to eq unique_id
       end
     end
   end

data/spec/lib/sufia/user_stat_importer_spec.rb

@@ -10,6 +10,7 @@ describe Sufia::UserStatImporter do
 
   let(:bilbo) { FactoryGirl.create(:user, email: 'bilbo@example.com') }
   let(:frodo) { FactoryGirl.create(:user, email: 'frodo@example.com') }
+  let!(:gollum) { FactoryGirl.create(:user, email: 'gollum@example.com') }
 
   let!(:bilbo_file_1) do
     GenericFile.new(id: 'bilbo1').tap do |f|
@@ -143,7 +144,7 @@ describe Sufia::UserStatImporter do
     end
 
     it "doesn't duplicate entries for existing dates" do
-      expect(User.count).to eq 2
+      expect(User.count).to eq 3
       expect(UserStat.count).to eq 3
 
       Sufia::UserStatImporter.new.import
@@ -164,6 +165,13 @@ describe Sufia::UserStatImporter do
 
       expect(frodos_stats[0].file_downloads).to eq(frodo_file_1_download_stats[0].totalEvents.to_i)
     end
+
+    it "processes the oldest records first" do
+      # Since Gollum has no stats it will be the first one processed. 
+      # Followed by Frodo and Bilbo.
+      sorted_ids = Sufia::UserStatImporter.new.sorted_users.map { |u| u.id }
+      expect(sorted_ids).to eq([gollum.id, frodo.id, bilbo.id])
+    end
   end
 end
 

data/spec/models/ability_spec.rb

@@ -10,6 +10,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
     it { is_expected.to     be_able_to(:read,  ContentBlock) }
+    it { is_expected.to     be_able_to(:view_share_work, GenericFile) }
   end
 
   describe "a registered user" do
@@ -20,6 +21,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
     it { is_expected.to     be_able_to(:read,  ContentBlock) }
+    it { is_expected.to     be_able_to(:view_share_work, GenericFile) }
   end
 
   describe "a user in the admin group" do
@@ -31,6 +33,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.to be_able_to(:create, ContentBlock) }
     it { is_expected.to be_able_to(:update, ContentBlock) }
     it { is_expected.to be_able_to(:read,  ContentBlock) }
+    it { is_expected.to     be_able_to(:view_share_work, GenericFile) }
   end
 
 
@@ -58,13 +61,13 @@ describe Sufia::Ability, :type => :model do
     end
 
     context "with a ProxyDepositRequest that they receive" do
-      let(:request) { ProxyDepositRequest.create!(pid: file.id, receiving_user: user, sending_user: sender) }
+      let(:request) { ProxyDepositRequest.create!(generic_file_id: file.id, receiving_user: user, sending_user: sender) }
       it { should be_able_to(:accept, request) }
       it { should be_able_to(:reject, request) }
       it { should_not be_able_to(:destroy, request) }
 
       context "and the request has already been accepted" do
-        let(:request) { ProxyDepositRequest.create!(pid: file.id, receiving_user: user, sending_user: sender, status: 'accepted') }
+        let(:request) { ProxyDepositRequest.create!(generic_file_id: file.id, receiving_user: user, sending_user: sender, status: 'accepted') }
         it { should_not be_able_to(:accept, request) }
         it { should_not be_able_to(:reject, request) }
         it { should_not be_able_to(:destroy, request) }
@@ -72,13 +75,13 @@ describe Sufia::Ability, :type => :model do
     end
 
     context "with a ProxyDepositRequest they are the sender of" do
-      let(:request) { ProxyDepositRequest.create!(pid: file.id, receiving_user: sender, sending_user: user) }
+      let(:request) { ProxyDepositRequest.create!(generic_file_id: file.id, receiving_user: sender, sending_user: user) }
       it { should_not be_able_to(:accept, request) }
       it { should_not be_able_to(:reject, request) }
       it { should be_able_to(:destroy, request) }
 
       context "and the request has already been accepted" do
-        let(:request) { ProxyDepositRequest.create!(pid: file.id, receiving_user: sender, sending_user: user, status: 'accepted') }
+        let(:request) { ProxyDepositRequest.create!(generic_file_id: file.id, receiving_user: sender, sending_user: user, status: 'accepted') }
         it { should_not be_able_to(:accept, request) }
         it { should_not be_able_to(:reject, request) }
         it { should_not be_able_to(:destroy, request) }

data/spec/models/checksum_audit_log_spec.rb

@@ -14,8 +14,8 @@ describe ChecksumAuditLog do
 
   let(:version_uri) { f.content.versions.first.uri }
   let(:version_path) { 'content' }
-  let(:old) { ChecksumAuditLog.create(pid: f.id, dsid: version_path, version: version_uri, pass: 1, created_at: 2.minutes.ago) }
-  let(:new) { ChecksumAuditLog.create(pid: f.id, dsid: version_path, version: version_uri, pass: 0, created_at: 1.minute.ago) }
+  let(:old) { ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1, created_at: 2.minutes.ago) }
+  let(:new) { ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 0, created_at: 1.minute.ago) }
 
   context "a file with multiple checksums audits" do
     specify "should return a list of logs for this datastream sorted by date descending" do
@@ -26,11 +26,11 @@ describe ChecksumAuditLog do
 
   context "after multiple checksum audits where the checksum does not change" do
     specify "only one of them should be kept" do
-      success1 = ChecksumAuditLog.create(pid: f.id, dsid: version_path, version: version_uri, pass: 1)
+      success1 = ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
       ChecksumAuditLog.prune_history(f.id, version_path)
-      success2 = ChecksumAuditLog.create(pid: f.id, dsid: version_path, version: version_uri, pass: 1)
+      success2 = ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
       ChecksumAuditLog.prune_history(f.id, version_path)
-      success3 = ChecksumAuditLog.create(pid: f.id, dsid: version_path, version: version_uri, pass: 1)
+      success3 = ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
       ChecksumAuditLog.prune_history(f.id, version_path)
 
       expect { ChecksumAuditLog.find(success2.id) }.to raise_exception ActiveRecord::RecordNotFound
@@ -43,21 +43,21 @@ describe ChecksumAuditLog do
 
   context "should have an audit log history" do
     before do
-      ChecksumAuditLog.create(pid: f.id, dsid: 'content', version: 'v2', pass: 1)
-      ChecksumAuditLog.create(pid: f.id, dsid: 'thumbnail', version: 'v1', pass: 1)
+      ChecksumAuditLog.create(generic_file_id: f.id, dsid: 'content', version: 'v2', pass: 1)
+      ChecksumAuditLog.create(generic_file_id: f.id, dsid: 'thumbnail', version: 'v1', pass: 1)
     end
 
     specify "should have an audit log history" do
       audit = ChecksumAuditLog.get_audit_log(f.id, 'content', version_uri)
-      expect(audit.pid).to eq(f.id)
+      expect(audit.generic_file_id).to eq(f.id)
       expect(audit.version).to eq(version_uri)
 
       audit = ChecksumAuditLog.get_audit_log(f.id, 'content', 'v2')
-      expect(audit.pid).to eq(f.id)
+      expect(audit.generic_file_id).to eq(f.id)
       expect(audit.version).to eq('v2')
 
       audit = ChecksumAuditLog.get_audit_log(f.id, 'thumbnail', 'v1')
-      expect(audit.pid).to eq(f.id)
+      expect(audit.generic_file_id).to eq(f.id)
       expect(audit.version).to eq('v1')
 
     end

data/spec/models/collection_spec.rb

@@ -19,22 +19,17 @@ describe Collection, :type => :model do
   end
 
   describe "::bytes" do
-
+    subject { @collection.bytes }
     context "with no items" do
-      specify "is zero" do
-        @collection.save
-        expect(@collection.bytes).to eq 0
-      end
+      before { @collection.save }
+      it { is_expected.to eq 0 }
     end
 
-    context "with characterized GenericFiles" do
-      let(:file) { mock_model GenericFile, file_size: ["50"] }
-      before do
-        allow(@collection).to receive(:members).and_return([file, file])
-      end
-      specify "is the sum of the files' sizes" do
-        expect(@collection.bytes).to eq 100
-      end
+    context "with two 50 byte files" do
+      let(:bitstream) { double("content", size: "50")}
+      let(:file) { mock_model GenericFile, content: bitstream }
+      before { allow(@collection).to receive(:members).and_return([file, file]) }
+      it { is_expected.to eq 100 }
     end
 
   end