hyrax 1.1.1 → 2.0.0.beta1

data/spec/models/batch_upload_item_spec.rb

@@ -1,8 +1,7 @@
-require 'spec_helper'
-
 RSpec.describe BatchUploadItem do
   describe ".human_readable_type" do
     subject { described_class.human_readable_type }
+
     it { is_expected.to eq 'Works by Batch' }
   end
 end

data/spec/models/checksum_audit_log_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ChecksumAuditLog do
+RSpec.describe ChecksumAuditLog do
   let(:f) do
     file = FileSet.create do |gf|
       gf.apply_depositor_metadata('mjg36')
@@ -16,51 +14,149 @@ describe ChecksumAuditLog do
     f.original_file.versions.first.uri
   end
   let(:content_id) { f.original_file.id }
-  let(:old) { described_class.create(file_set_id: f.id, file_id: content_id, version: version_uri, pass: 1, created_at: 2.minutes.ago) }
-  let(:new) { described_class.create(file_set_id: f.id, file_id: content_id, version: version_uri, pass: 0, created_at: 1.minute.ago) }
+  let(:old) { described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true, created_at: 2.minutes.ago) }
+  let(:new) { described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: false, created_at: 1.minute.ago) }
 
-  context 'a file with multiple checksums audits' do
+  context 'a file with multiple checksums' do
     it 'returns a list of logs for this FileSet sorted by date descending' do
-      logs = described_class.logs_for(f.id, content_id)
+      logs = described_class.logs_for(f.id, checked_uri: version_uri)
       expect(logs).to eq([new, old])
     end
   end
 
-  context 'after multiple checksum audits where the checksum does not change' do
-    specify 'only one of them should be kept' do
-      success1 = described_class.create(file_set_id: f.id, file_id: content_id, version: version_uri, pass: 1)
-      described_class.prune_history(f.id, content_id)
-      success2 = described_class.create(file_set_id: f.id, file_id: content_id, version: version_uri, pass: 1)
-      described_class.prune_history(f.id, content_id)
-      success3 = described_class.create(file_set_id: f.id, file_id: content_id, version: version_uri, pass: 1)
-      described_class.prune_history(f.id, content_id)
-
-      expect { described_class.find(success2.id) }.to raise_exception ActiveRecord::RecordNotFound
-      expect { described_class.find(success3.id) }.to raise_exception ActiveRecord::RecordNotFound
-      expect(described_class.find(success1.id)).not_to be_nil
-      logs = described_class.logs_for(f.id, content_id)
-      expect(logs).to eq([success1, new, old])
+  describe ".create_and_prune!" do
+    let(:file_set_id) { 'file_set_id' }
+    let(:checked_uri) { "file_id/fcr:versions/version1" }
+
+    subject { described_class.create_and_prune!(passed: passed, file_set_id: 'file_set_id', file_id: 'file_id', checked_uri: checked_uri, expected_result: '1234') }
+
+    describe 'when check passed' do
+      let(:passed) { true }
+
+      it { is_expected.to be_a(described_class) }
+      it 'will prune history' do
+        expect(described_class).to receive(:prune_history).with(file_set_id, checked_uri: checked_uri)
+        subject
+      end
+    end
+    describe 'when check failed' do
+      let(:passed) { false }
+
+      it { is_expected.to be_a(described_class) }
+      it 'will not prune history' do
+        expect(described_class).not_to receive(:prune_history).with(file_set_id, checked_uri: checked_uri)
+        subject
+      end
     end
   end
 
-  context 'should have an audit log history' do
-    before do
-      described_class.create(file_set_id: f.id, file_id: content_id, version: 'v2', pass: 1)
-      described_class.create(file_set_id: f.id, file_id: 'thumbnail', version: 'v1', pass: 1)
+  describe ".prune_history" do
+    let(:file_set_id) { "file_set_id" }
+    let(:file_id) { "file_id" }
+    let(:version_uri) { "#{file_id}/fcr:versions/version1" }
+
+    context "one passing record" do
+      let!(:record) { described_class.create(created_at: 1.day.ago, file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+
+      before do
+        described_class.prune_history(file_set_id, checked_uri: version_uri)
+      end
+
+      it "keeps record" do
+        expect(described_class.logs_for(file_set_id, checked_uri: version_uri).count).to eq(1)
+      end
     end
 
-    it "has an audit log history" do
-      audit = described_class.get_audit_log(f.id, content_id, version_uri)
-      expect(audit.file_set_id).to eq(f.id)
-      expect(audit.version).to eq(version_uri)
+    context "two passing records" do
+      let!(:older) { described_class.create(created_at: 1.day.ago, file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+      let!(:newer) { described_class.create(created_at: 0.days.ago, file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+
+      before do
+        described_class.prune_history(file_set_id, checked_uri: version_uri)
+      end
+
+      it "keeps latest, gets rid of previous" do
+        logs = described_class.logs_for(file_set_id, checked_uri: version_uri).to_a
+        expect(logs.length).to eq 1
+        expect(logs.first.id).to eq newer.id
+      end
+    end
 
-      audit = described_class.get_audit_log(f.id, content_id, 'v2')
-      expect(audit.file_set_id).to eq(f.id)
-      expect(audit.version).to eq('v2')
+    context "complex history" do
+      let!(:first)  { described_class.create(file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+      let!(:second) { described_class.create(file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+      let!(:third)  { described_class.create(file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: false) }
+      let!(:fourth) { described_class.create(file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+      let!(:fifth)  { described_class.create(file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
+      let!(:sixth)  { described_class.create(file_set_id: file_set_id, file_id: file_id, checked_uri: version_uri, passed: true) }
 
-      audit = described_class.get_audit_log(f.id, 'thumbnail', 'v1')
-      expect(audit.file_set_id).to eq(f.id)
-      expect(audit.version).to eq('v1')
+      before do
+        described_class.prune_history(file_set_id, checked_uri: version_uri)
+      end
+      it "keeps latest, failing, and previous/next of failing" do
+        logs = described_class.logs_for(file_set_id, checked_uri: version_uri).reorder("created_at asc")
+        expect(logs.collect(&:id)).to eq([second.id, third.id, fourth.id, sixth.id])
+        expect(logs.collect(&:passed)).to eq([true, false, true, true])
+      end
+    end
+
+    context 'after multiple checksum events where the checksum does not change' do
+      specify 'only one of them should be kept' do
+        success1 = described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true)
+        described_class.prune_history(f.id, checked_uri: version_uri)
+        success2 = described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true)
+        described_class.prune_history(f.id, checked_uri: version_uri)
+        success3 = described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true)
+
+        described_class.prune_history(f.id, checked_uri: version_uri)
+
+        expect { described_class.find(success1.id) }.to raise_exception ActiveRecord::RecordNotFound
+        expect { described_class.find(success2.id) }.to raise_exception ActiveRecord::RecordNotFound
+        expect(described_class.find(success3.id)).not_to be_nil
+        logs = described_class.logs_for(f.id, checked_uri: version_uri)
+        expect(logs.collect(&:id)).to eq([success3.id])
+      end
+    end
+  end
+
+  context "multiple versions with multiple checks" do
+    # I don't quite understand how our FileSet already has multiple
+    # versions, but that's great since I couldn't figure out a reasonable
+    # way to create them. Note you need to #all here, or you get
+    # really confusing stuff.
+    let(:verisons_uri) { f.original_file.versions.all.first.uri }
+    let(:version_uri2) { f.original_file.versions.all.second.uri }
+
+    before do
+      described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true, created_at: 2.days.ago)
+      described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true, created_at: 1.day.ago)
+      described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri, passed: true)
+
+      described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri2, passed: true, created_at: 2.days.ago)
+      described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri2, passed: false, created_at: 1.day.ago)
+      described_class.create(file_set_id: f.id, file_id: content_id, checked_uri: version_uri2, passed: true)
+    end
+    describe ".latest_checks" do
+      it "returns only latest for each checked_uri" do
+        expected = [
+          described_class.where(checked_uri: version_uri).order("created_at desc").first,
+          described_class.where(checked_uri: version_uri2).order("created_at desc").first
+        ]
+        expect(described_class.latest_checks).to match_array(expected)
+      end
+    end
+    describe ".latest_for_file_set_id" do
+      before do
+        # add some for another file set, doens't matter it doesn't exist
+        described_class.create(file_set_id: "somethingelse", file_id: "whatever", checked_uri: "http://example.org/w")
+      end
+      it "returns only the lastest check for FileSet specified" do
+        expected = [
+          described_class.where(checked_uri: version_uri).order("created_at desc").first,
+          described_class.where(checked_uri: version_uri2).order("created_at desc").first
+        ]
+        expect(described_class.latest_for_file_set_id(f.id)).to match_array(expected)
+      end
     end
   end
 end

data/spec/models/collection_spec.rb

@@ -1,5 +1,5 @@
-describe Collection do
-  let(:collection) { create(:public_collection) }
+RSpec.describe Collection do
+  let(:collection) { build(:public_collection) }
 
   it "has open visibility" do
     expect(collection.read_groups).to eq ['public']
@@ -32,6 +32,7 @@ describe Collection do
 
   describe "#depositor" do
     let(:user) { build(:user) }
+
     before do
       subject.apply_depositor_metadata(user)
     end
@@ -43,6 +44,7 @@ describe Collection do
 
   describe "#members_objects" do
     let(:collection) { create(:collection) }
+
     it "is empty by default" do
       expect(collection.member_objects).to match_array []
     end
@@ -77,6 +79,7 @@ describe Collection do
     let(:collection) { build(:collection) }
     let(:work1) { create(:work) }
     let(:work2) { create(:work) }
+
     before do
       collection.add_member_objects [work1.id, work2.id]
       collection.save!

data/spec/models/content_block_spec.rb

@@ -1,89 +1,198 @@
-describe ContentBlock, type: :model do
-  let!(:bilbo) do
-    create(:content_block,
-           name: ContentBlock::RESEARCHER,
-           value: '<h1>Bilbo Baggins</h1>',
-           created_at: Time.zone.now)
-  end
-
-  let!(:frodo) do
-    create(:content_block,
-           name: ContentBlock::RESEARCHER,
-           value: '<h1>Frodo Baggins</h1>',
-           created_at: 2.hours.ago)
-  end
+RSpec.describe ContentBlock, type: :model do
+  describe '.for' do
+    context 'with a nil' do
+      it 'raises an ArgumentError' do
+        expect { described_class.for(nil) }.to raise_error(ArgumentError)
+      end
+    end
+    context 'with a non-whitelisted value' do
+      it 'raises an ArgumentError' do
+        expect { described_class.for(:destroy_all) }.to raise_error(ArgumentError)
+      end
+    end
+    context 'with a whitelisted value as a symbol' do
+      subject { described_class.for(:about) }
 
-  let!(:marketing) do
-    create(:content_block,
-           name: ContentBlock::MARKETING,
-           value: '<h1>Marketing Text</h1>')
-  end
+      it 'returns a new instance' do
+        expect(described_class).to receive(:about_page).and_call_original
+        expect(subject).to be_instance_of ContentBlock
+        expect(subject).to be_persisted
+      end
+    end
+    context 'with a whitelisted value as a string' do
+      subject { described_class.for('about') }
 
-  let!(:announcement) do
-    create(:content_block,
-           name: ContentBlock::ANNOUNCEMENT,
-           value: '<h1>Announcement Text</h1>')
+      it 'returns a new instance' do
+        expect(described_class).to receive(:about_page).and_call_original
+        expect(subject).to be_instance_of ContentBlock
+        expect(subject).to be_persisted
+      end
+    end
   end
 
   describe '.announcement_text' do
-    subject { described_class.announcement_text.value }
+    let!(:announcement) do
+      create(:content_block,
+             name: ContentBlock::NAME_REGISTRY[:announcement],
+             value: '<h1>Announcement Text</h1>')
+    end
+
+    subject { described_class.for(:announcement).value }
+
     it { is_expected.to eq '<h1>Announcement Text</h1>' }
   end
 
   describe '.announcement_text=' do
     let(:new_announcement) { '<h2>Foobar</h2>' }
+
     it 'sets a new announcement_text' do
       described_class.announcement_text = new_announcement
-      expect(described_class.announcement_text.value).to eq new_announcement
+      expect(described_class.for(:announcement).value).to eq new_announcement
     end
   end
 
   describe '.marketing_text' do
-    subject { described_class.marketing_text.value }
+    let!(:marketing) do
+      create(:content_block,
+             name: ContentBlock::NAME_REGISTRY[:marketing],
+             value: '<h1>Marketing Text</h1>')
+    end
+
+    subject { described_class.for(:marketing).value }
+
     it { is_expected.to eq '<h1>Marketing Text</h1>' }
   end
 
   describe '.marketing_text=' do
     let(:new_marketing) { '<h2>Barbaz</h2>' }
+
     it 'sets a new marketing_text' do
       described_class.marketing_text = new_marketing
-      expect(described_class.marketing_text.value).to eq new_marketing
+      expect(described_class.for(:marketing).value).to eq new_marketing
     end
   end
 
-  describe '.recent_researchers' do
-    subject { described_class.recent_researchers }
+  describe '.featured_researcher' do
+    let!(:bilbo) do
+      create(:content_block,
+             name: ContentBlock::NAME_REGISTRY[:researcher],
+             value: '<h1>Bilbo Baggins</h1>',
+             created_at: Time.zone.now)
+    end
+
+    subject { described_class.for(:researcher) }
 
-    it 'returns featured_researcher entries in chronological order' do
-      expect(subject.count).to eq 2
-      expect(subject).to eq [bilbo, frodo]
+    it 'returns entry for featured_researcher' do
+      expect(subject).to eq bilbo
     end
   end
 
-  describe '.featured_researcher' do
-    subject { described_class.featured_researcher }
+  describe '.featured_researcher=' do
+    let(:new_researcher) { '<h2>Baz Quux</h2>' }
 
-    it 'finds the most recent entry for featured_researcher' do
-      expect(subject).to eq bilbo
+    it 'adds a new featured researcher' do
+      described_class.featured_researcher = new_researcher
+      expect(described_class.for(:researcher).value).to eq new_researcher
     end
+  end
 
-    context 'with no researchers present' do
-      before do
-        allow(described_class).to receive(:recent_researchers) { described_class.none }
-      end
-      it 'creates a new researcher' do
-        expect(described_class).to receive(:create).with(name: ContentBlock::RESEARCHER)
-        described_class.featured_researcher
+  describe '.agreement_page' do
+    before do
+      allow(ApplicationController).to receive(:helpers).and_return(helper_module)
+    end
+    let(:helper_module) do
+      double('helpers',
+             application_name: 'TheBest',
+             institution_name: 'Foo E D U',
+             institution_name_full: 'Foolhardy Edutainment')
+    end
+
+    subject { described_class.for(:agreement) }
+
+    it 'defaults to text loaded from a template' do
+      expect(subject.value).to include 'TheBest Deposit Agreement'
+    end
+  end
+
+  describe '.agreement_page=' do
+    let(:new_agreement) { '<h2>Quuuuuuuuuux</h2>' }
+
+    it 'changes the agreement page value' do
+      described_class.agreement_page = new_agreement
+      expect(described_class.for(:agreement).value).to eq new_agreement
+    end
+  end
+
+  describe '.terms_page' do
+    before do
+      allow(ApplicationController).to receive(:helpers).and_return(helper_module)
+    end
+    let(:helper_module) do
+      double('helpers',
+             application_name: 'TheBest',
+             institution_name: 'Foo E D U',
+             institution_name_full: 'Foolhardy Edutainment')
+    end
+
+    subject { described_class.for(:terms) }
+
+    it 'defaults to text loaded from a template' do
+      expect(subject.value).to include 'Terms of Use for TheBest'
+    end
+  end
+
+  describe '.terms_page=' do
+    let(:new_terms) { '<h2>Fooooooob</h2>' }
+
+    it 'changes the terms page value' do
+      described_class.terms_page = new_terms
+      expect(described_class.for(:terms).value).to eq new_terms
+    end
+  end
+
+  context "the about page" do
+    before do
+      create(:content_block,
+             name: ContentBlock::NAME_REGISTRY[:about],
+             value: '<h1>About Page</h1>')
+    end
+
+    describe 'getter' do
+      subject { described_class.for(:about).value }
+
+      it { is_expected.to eq '<h1>About Page</h1>' }
+    end
+
+    describe 'setter' do
+      let(:new_about) { '<h2>Foobarfoo</h2>' }
+
+      it 'sets a new about_page' do
+        described_class.about_page = new_about
+        expect(described_class.for(:about).value).to eq new_about
       end
     end
   end
 
-  describe '.featured_researcher=' do
-    let(:new_researcher) { '<h2>Baz Quux</h2>' }
-    it 'adds a new featured researcher' do
-      expect { described_class.featured_researcher = new_researcher }
-        .to change { described_class.recent_researchers.count }.by(1)
-      expect(described_class.featured_researcher.value).to eq new_researcher
+  context "the help page" do
+    before do
+      create(:content_block,
+             name: ContentBlock::NAME_REGISTRY[:help],
+             value: '<h1>Help Page</h1>')
+    end
+
+    describe 'getter' do
+      subject { described_class.for(:help).value }
+
+      it { is_expected.to eq '<h1>Help Page</h1>' }
+    end
+
+    describe 'setter' do
+      let(:new_help) { '<h2>Foobarfoo</h2>' }
+
+      it 'sets a new help_page' do
+        described_class.help_page = new_help
+        expect(described_class.for(:help).value).to eq new_help
+      end
     end
   end
 end