sufia 5.0.0 → 6.0.0.beta1

data/spec/jobs/event_jobs_spec.rb

@@ -1,20 +1,16 @@
 require 'spec_helper'
 
 describe 'event jobs' do
-  before(:each) do
+  before do
     @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
     @third_user = FactoryGirl.find_or_create(:curator)
-    @gf = GenericFile.new(pid: 'test:123')
+    @gf = GenericFile.new(id: 'test-123')
     @gf.apply_depositor_metadata(@user)
     @gf.title = ['Hamlet']
     @gf.save
   end
-  after(:each) do
-    @gf.delete
-    @user.delete
-    @another_user.delete
-    @third_user.delete
+  after do
     $redis.keys('events:*').each { |key| $redis.del key }
     $redis.keys('User:*').each { |key| $redis.del key }
     $redis.keys('GenericFile:*').each { |key| $redis.del key }
@@ -75,8 +71,8 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deposited <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentDepositEventJob.new('test:123', @user.user_key).run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deposited <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    ContentDepositEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(1)
@@ -91,8 +87,8 @@ describe 'event jobs' do
     @third_user.follow(@another_user)
     allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has transferred <a href="/files/123">Hamlet</a> to user <a href="/users/archivist1@example-dot-com">archivist1@example.com</a>', timestamp: '1' }
-    ContentDepositorChangeEventJob.new('test:123', @another_user.user_key).run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has transferred <a href="/files/test-123">Hamlet</a> to user <a href="/users/archivist1@example-dot-com">archivist1@example.com</a>', timestamp: '1' }
+    ContentDepositorChangeEventJob.new('test-123', @another_user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(1)
@@ -112,8 +108,8 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentUpdateEventJob.new('test:123', @user.user_key).run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    ContentUpdateEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(1)
@@ -133,8 +129,8 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has added a new version of <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentNewVersionEventJob.new('test:123', @user.user_key).run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has added a new version of <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    ContentNewVersionEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(1)
@@ -154,8 +150,8 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has restored a version \'content.0\' of <a href="/files/123">Hamlet</a>', timestamp: '1' }
-    ContentRestoredVersionEventJob.new('test:123', @user.user_key, 'content.0').run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has restored a version \'content.0\' of <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    ContentRestoredVersionEventJob.new('test-123', @user.user_key, 'content.0').run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(1)
@@ -173,8 +169,8 @@ describe 'event jobs' do
     expect(@another_user.events.length).to eq(0)
     expect(@third_user.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deleted file \'123\'', timestamp: '1' }
-    ContentDeleteEventJob.new('test:123', @user.user_key).run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deleted file \'test-123\'', timestamp: '1' }
+    ContentDeleteEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(1)
@@ -192,8 +188,8 @@ describe 'event jobs' do
     expect(@gf.events.length).to eq(0)
     @now = Time.now
     expect(Time).to receive(:now).at_least(:once).and_return(@now)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/123">Hamlet</a>', timestamp: @now.to_i.to_s }
-    ContentUpdateEventJob.new('test:123', @user.user_key).run
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/test-123">Hamlet</a>', timestamp: @now.to_i.to_s }
+    ContentUpdateEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
     expect(@another_user.events.length).to eq(0)

data/spec/jobs/import_url_job_spec.rb

@@ -18,14 +18,10 @@ describe ImportUrlJob do
   let(:mock_response) do
     double('response').tap do |http_res|
       allow(http_res).to receive(:start).and_yield
-       allow(http_res).to receive(:read_body).and_yield(File.open(File.expand_path('../../fixtures/world.png', __FILE__)).read)
+      allow(http_res).to receive(:read_body).and_yield(File.open(File.expand_path('../../fixtures/world.png', __FILE__)).read)
     end
   end
 
-  after do
-    generic_file.destroy
-  end
-
   subject(:job) { ImportUrlJob.new(generic_file.id) }
 
   it "should have no content at the outset" do
@@ -49,7 +45,6 @@ describe ImportUrlJob do
       expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
       job.run
       expect(generic_file.reload.content.size).to eq 4218
-      expect(generic_file.content.dsLabel).to eq file_path
       expect(user.mailbox.inbox.first.last_message.body).to eq("The file (#{file_path}) was successfully imported.")
     end
   end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -15,10 +15,6 @@ describe IngestLocalFileJob do
     FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), @mock_upload_directory)
   end
 
-  after do
-    generic_file.destroy
-  end
-
   it "should have attached a file" do
     job.run
     expect(generic_file.reload.content.size).to eq(4218)

data/spec/lib/sufia/breadcrumbs_spec.rb

@@ -54,63 +54,25 @@ describe Sufia::Breadcrumbs do
         expect(crumbs.trail_from_referer).to eql([[I18n.t('sufia.bread_crumb.search_results'), referer]])
       end
     end
-    context "when coming places other than the catalog" do
+    context "when coming from the dashboard" do
       before do
-        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
+        allow(crumbs.request).to receive(:referer).and_return("http://...dashboard/")
         allow(crumbs).to receive(:user_signed_in?) { true }
-        allow(crumbs).to receive(:action_name).and_return("view")
       end
       specify "the trail goes back to the user's files" do
         allow(crumbs).to receive(:controller_name).and_return("my/files")
-        crumbs.trail_from_referer
-        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
       end
       specify "the trail goes back to the user's collections" do
         allow(crumbs).to receive(:controller_name).and_return("my/collections")
-        crumbs.trail_from_referer
-        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
+        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
       end
       specify "the trail goes back to the user's files when on the batch edit page" do
         allow(crumbs).to receive(:controller_name).and_return("batch_edit")
-        crumbs.trail_from_referer
-        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
-      end
-    end
-
-    context "when editing a file" do
-      before do
-        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
-        allow(crumbs).to receive(:user_signed_in?) { true }
-        allow(crumbs).to receive(:action_name).and_return("edit")
-        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
-        allow(crumbs).to receive(:controller_name).and_return("generic_files")
-      end
-
-      specify "the trail goes back to the user's files and the browse view" do
-        crumbs.trail_from_referer
-        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail[1]).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
-        expect(crumbs.trail.last).to eql([I18n.t('sufia.generic_file.browse_view'), sufia.generic_file_path("abc123")])
-      end
-    end
-
-    context "when viewing file statistics" do
-      before do
-        allow(crumbs.request).to receive(:referer).and_return("http://...blargh/")
-        allow(crumbs).to receive(:user_signed_in?) { true }
-        allow(crumbs).to receive(:action_name).and_return("stats")
-        allow(crumbs).to receive(:params).and_return({"id" => "abc123"})
-        allow(crumbs).to receive(:controller_name).and_return("generic_files")
-      end
-
-      specify "the trail goes back to the user's files and the browse view" do
-        crumbs.trail_from_referer
-        expect(crumbs.trail.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
-        expect(crumbs.trail[1]).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
-        expect(crumbs.trail.last).to eql([I18n.t('sufia.generic_file.browse_view'), sufia.generic_file_path("abc123")])
+        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
       end
     end
   end

data/spec/lib/sufia/id_service_spec.rb

@@ -10,13 +10,18 @@ describe Sufia::IdService do
       expect(Sufia::IdService.mint).to_not eq subject
     end
 
-    it "should be valid" do    
+    it "should be valid" do
       expect(Sufia::IdService.valid?(subject)).to be true
     end
 
+    it "should be reversable" do
+      new_id = Sufia::IdService.mint
+      expect(Sufia::Noid.noidify(new_id)).to eq new_id
+    end
+
     context "when the pid already exists in Fedora" do
-      let(:mock_pid) { 'scholarsphere:ef12ef12f' }
-      let(:unique_pid) {  'scholarsphere:bb22bb22b' }
+      let(:mock_pid) { 'ef12ef12f' }
+      let(:unique_pid) { 'bb22bb22b' }
 
       before do
         allow(Sufia::IdService).to receive(:next_id).and_return(mock_pid, unique_pid)

data/spec/lib/sufia/user_stat_importer_spec.rb

@@ -4,13 +4,6 @@ require_relative '../../../sufia-models/lib/sufia/models/stats/user_stat_importe
 describe Sufia::UserStatImporter do
 
   before do
-    GenericFile.delete_all
-    User.delete_all
-
-    UserStat.delete_all
-    FileViewStat.delete_all
-    FileDownloadStat.delete_all
-
     allow(Sufia.config).to receive(:analytic_start_date) { dates[0] }
     stub_out_call_to_google_analytics
   end
@@ -19,21 +12,21 @@ describe Sufia::UserStatImporter do
   let(:frodo) { FactoryGirl.create(:user, email: 'frodo@example.com') }
 
   let!(:bilbo_file_1) do
-    GenericFile.new(pid: 'bilbo:1').tap do |f|
+    GenericFile.new(id: 'bilbo1').tap do |f|
       f.apply_depositor_metadata(bilbo.email)
       f.save
     end
   end
 
   let!(:bilbo_file_2) do
-    GenericFile.new(pid: 'bilbo:2').tap do |f|
+    GenericFile.new(id: 'bilbo2').tap do |f|
       f.apply_depositor_metadata(bilbo.email)
       f.save
     end
   end
 
   let!(:frodo_file_1) do
-    GenericFile.new(pid: 'frodo:1').tap do |f|
+    GenericFile.new(id: 'frodo1').tap do |f|
       f.apply_depositor_metadata(frodo.email)
       f.save
     end
@@ -84,31 +77,31 @@ describe Sufia::UserStatImporter do
 
   let(:bilbo_file_1_download_stats) {
     [
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[0], totalEvents: "2"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[1], totalEvents: "3"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[2], totalEvents: "5"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[3], totalEvents: "3"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:1", date: date_strs[4], totalEvents: "7"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[0], totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[1], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[2], totalEvents: "5"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[3], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[4], totalEvents: "7"),
     ]
   }
 
   let(:bilbo_file_2_download_stats) {
     [
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[0], totalEvents: "1"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[1], totalEvents: "4"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[2], totalEvents: "3"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[3], totalEvents: "2"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo:2", date: date_strs[4], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[0], totalEvents: "1"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[1], totalEvents: "4"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[2], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[3], totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[4], totalEvents: "3"),
     ]
   }
 
   let(:frodo_file_1_download_stats) {
     [
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[0], totalEvents: "5"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[1], totalEvents: "4"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[2], totalEvents: "2"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[3], totalEvents: "1"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo:1", date: date_strs[4], totalEvents: "6"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[0], totalEvents: "5"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[1], totalEvents: "4"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[2], totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[3], totalEvents: "1"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[4], totalEvents: "6"),
     ]
   }
 

data/spec/lib/sufia/writable_permissions_spec.rb

@@ -7,10 +7,6 @@ describe Sufia::Permissions::Writable do
   end
   let(:subject) { SampleModel.new }
 
-  it "should initialized with a parnoid rightsMetadata datastream" do
-    expect(subject.rightsMetadata).to be_kind_of ParanoidRightsDatastream
-  end
-
   describe "#permissions" do
     it "should initialize with nothing specified" do
       expect(subject.permissions).to be_empty

data/spec/models/ability_spec.rb

@@ -27,6 +27,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.to be_able_to(:update, ContentBlock) }
   end
 
+
   describe "proxies and transfers" do
     let(:sender) { FactoryGirl.find_or_create(:jill) }
     let(:user) { FactoryGirl.find_or_create(:archivist) }
@@ -37,38 +38,44 @@ describe Sufia::Ability, :type => :model do
       end
     end
     subject { Ability.new(user) }
-    it { is_expected.not_to be_able_to(:transfer, file.pid) }
+    it { should_not be_able_to(:transfer, file.id) }
+
+    describe "depositor_for_document" do
+      it "should return the depositor" do
+        expect(subject.send(:depositor_for_document, file.id)).to eq sender.user_key
+      end
+    end
 
     context "with a ProxyDepositRequest for a file they have deposited" do
       subject { Ability.new(sender) }
-      it { is_expected.to be_able_to(:transfer, file.pid) }
+      it { should be_able_to(:transfer, file.id) }
     end
 
     context "with a ProxyDepositRequest that they receive" do
-      let(:request) { ProxyDepositRequest.create!(pid: file.pid, receiving_user: user, sending_user: sender) }
-      it { is_expected.to be_able_to(:accept, request) }
-      it { is_expected.to be_able_to(:reject, request) }
-      it { is_expected.not_to be_able_to(:destroy, request) }
+      let(:request) { ProxyDepositRequest.create!(pid: 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.pid, receiving_user: user, sending_user: sender, status: 'accepted') }
-        it { is_expected.not_to be_able_to(:accept, request) }
-        it { is_expected.not_to be_able_to(:reject, request) }
-        it { is_expected.not_to be_able_to(:destroy, request) }
+        let(:request) { ProxyDepositRequest.create!(pid: 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) }
       end
     end
 
     context "with a ProxyDepositRequest they are the sender of" do
-      let(:request) { ProxyDepositRequest.create!(pid: file.pid, receiving_user: sender, sending_user: user) }
-      it { is_expected.not_to be_able_to(:accept, request) }
-      it { is_expected.not_to be_able_to(:reject, request) }
-      it { is_expected.to be_able_to(:destroy, request) }
+      let(:request) { ProxyDepositRequest.create!(pid: 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.pid, receiving_user: sender, sending_user: user, status: 'accepted') }
-        it { is_expected.not_to be_able_to(:accept, request) }
-        it { is_expected.not_to be_able_to(:reject, request) }
-        it { is_expected.not_to be_able_to(:destroy, request) }
+        let(:request) { ProxyDepositRequest.create!(pid: 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) }
       end
     end
   end

data/spec/models/batch_spec.rb

@@ -1,66 +1,37 @@
 require 'spec_helper'
 
-describe Batch, :type => :model do
-  before(:all) do
-    @user = FactoryGirl.find_or_create(:jill)
-    @file = GenericFile.new
-    @file.apply_depositor_metadata('mjg36')
-    @file.save
-    @batch = Batch.create(title: ["test collection"],
-                          creator: @user.user_key,
-                          part: @file.pid)
-  end
-  after(:all) do
-    @user.delete
-    @file.delete
-    @batch.delete
-  end
-  it "should have rightsMetadata" do
-    expect(@batch.rightsMetadata).to be_instance_of Hydra::Datastream::RightsMetadata
-  end
-  it "should have dc desc metadata" do
-    expect(@batch.descMetadata).to be_kind_of BatchRdfDatastream
-  end
+describe Batch do
+  let(:user) { FactoryGirl.find_or_create(:jill) }
+  let(:batch) { Batch.create(title: ["test collection"], creator: [user.user_key]) }
+
   it "should belong to testuser" do
-    expect(@batch.creator).to eq([@user.user_key])
+    expect(batch.creator).to eq [user.user_key]
   end
   it "should be titled 'test collection'" do
-    expect(@batch.title).to eq(["test collection"])
+    expect(batch.title).to eq ["test collection"]
   end
   it "should have generic_files defined" do
-    expect(@batch).to respond_to(:generic_files)
-  end
-  it "should contain one generic file" do
-    expect(@batch.part).to eq([@file.pid])
-  end
-  it "should be able to have more than one file" do
-    gf = GenericFile.new
-    gf.apply_depositor_metadata('mjg36')
-    gf.save
-    @batch.part << gf.pid
-    @batch.save
-    expect(@batch.part).to eq([@file.pid, gf.pid])
-    gf.delete
+    expect(batch).to respond_to(:generic_files)
   end
+
   it "should support to_solr" do
-    expect(@batch.to_solr).not_to be_nil
-    expect(@batch.to_solr["batch__part_t"]).to be_nil
-    expect(@batch.to_solr["batch__title_t"]).to be_nil
-    expect(@batch.to_solr["batch__creator_t"]).to be_nil
+    expect(batch.to_solr).to_not be_nil
+    expect(batch.to_solr["batch__title_t"]).to be_nil
+    expect(batch.to_solr["batch__creator_t"]).to be_nil
   end
   describe "find_or_create" do
     describe "when the object exists" do
+      let! (:batch) { Batch.create(title: ["test collection"], creator: [user.user_key]) }
       it "should find batch instead of creating" do
-        expect(Batch).to receive(:create).never
-        @b2 = Batch.find_or_create( @batch.pid)
+        expect(Batch).to_not receive(:create)
+        Batch.find_or_create(batch.id)
       end
     end
     describe "when the object does not exist" do
       it "should create" do
-        expect {Batch.find("batch:123")}.to raise_error(ActiveFedora::ObjectNotFoundError)
+        expect { Batch.find("batch-123") }.to raise_error(ActiveFedora::ObjectNotFoundError)
         expect(Batch).to receive(:create).once.and_return("the batch")
-        @b2 = Batch.find_or_create( "batch:123")
-        expect(@b2).to eq("the batch")
+        expect(Batch.find_or_create("batch-123")).to eq "the batch"
       end
     end
   end