hydra-works 0.1.0 → 0.2.0

data/spec/hydra/works/models/concerns/block_child_objects_spec.rb

@@ -1,19 +1,17 @@
 require 'spec_helper'
 
 describe Hydra::Works::BlockChildObjects do
-
   subject { Hydra::Works::GenericFile::Base.new }
 
-  describe "#child_objects=?" do
-    it "should raise an error" do
-      expect { subject.child_objects = [] }.to raise_error(StandardError, /method `child_objects=' not allowed for #<Hydra::Works::GenericFile::Base.*/)
+  describe '#objects=?' do
+    it 'raises an error' do
+      expect { subject.objects = [] }.to raise_error(StandardError, /method `objects=' not allowed for #<Hydra::Works::GenericFile::Base.*/)
     end
   end
 
-  describe "#child_objects" do
-    it "should raise an error" do
-      expect { subject.child_objects }.to raise_error(StandardError, /method `child_objects' not allowed for #<Hydra::Works::GenericFile::Base.*/)
+  describe '#objects' do
+    it 'raises an error' do
+      expect { subject.objects }.to raise_error(StandardError, /method `objects' not allowed for #<Hydra::Works::GenericFile::Base.*/)
     end
   end
-
 end

data/spec/hydra/works/models/concerns/generic_file/contained_files_spec.rb

@@ -1,116 +1,108 @@
 require 'spec_helper'
 
 describe Hydra::Works::GenericFile::ContainedFiles do
-
   let(:generic_file) do
     Hydra::Works::GenericFile::Base.create
   end
 
-  let(:thumbnail)   do
+  let(:thumbnail) do
     file = generic_file.files.build
     Hydra::PCDM::AddTypeToFile.call(file, pcdm_thumbnail_uri)
   end
 
   let(:file)                { generic_file.files.build }
-  let(:pcdm_thumbnail_uri)  { ::RDF::URI("http://pcdm.org/use#ThumbnailImage") }
+  let(:pcdm_thumbnail_uri)  { ::RDF::URI('http://pcdm.org/use#ThumbnailImage') }
 
   before do
     generic_file.files = [file]
   end
 
-  describe "#thumbnail" do
-
-    context "when a thumbnail is present" do
+  describe '#thumbnail' do
+    context 'when a thumbnail is present' do
       before do
         original_file = generic_file.build_thumbnail
-        original_file.content = "thumbnail"
+        original_file.content = 'thumbnail'
       end
       subject { generic_file.thumbnail }
-      it "can be saved without errors" do
+      it 'can be saved without errors' do
         expect(subject.save).to be_truthy
       end
-      it "retrieves content of the thumbnail" do
-        expect(subject.content).to eql "thumbnail"
+      it 'retrieves content of the thumbnail' do
+        expect(subject.content).to eql 'thumbnail'
       end
-      it "retains origin pcdm.File RDF type" do
-        expect(subject.metadata_node.type).to include( ::RDF::URI("http://pcdm.org/use#ThumbnailImage") )
-        expect(subject.metadata_node.type).to include(RDFVocabularies::PCDMTerms.File)
+      it 'retains origin pcdm.File RDF type' do
+        expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#ThumbnailImage'))
+        expect(subject.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
 
-    context "when building new thumbnail" do
+    context 'when building new thumbnail' do
       subject { generic_file.build_thumbnail }
-      it "initializes an unsaved File object with Thumbnail type" do
+      it 'initializes an unsaved File object with Thumbnail type' do
         expect(subject).to be_new_record
         expect(subject.metadata_node.type).to include(pcdm_thumbnail_uri)
-        expect(subject.metadata_node.type).to include(RDFVocabularies::PCDMTerms.File)
+        expect(subject.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
-
   end
 
-  describe "#original_file" do
-
-    context "when an original file is present" do
+  describe '#original_file' do
+    context 'when an original file is present' do
       before do
         original_file = generic_file.build_original_file
-        original_file.content = "original_file"
+        original_file.content = 'original_file'
       end
       subject { generic_file.original_file }
 
-      it "can be saved without errors" do
+      it 'can be saved without errors' do
         expect(subject.save).to be_truthy
       end
-      it "retrieves content of the original_file as a PCDM File" do
-        expect(subject.content).to eql "original_file"
+      it 'retrieves content of the original_file as a PCDM File' do
+        expect(subject.content).to eql 'original_file'
         expect(subject).to be_instance_of Hydra::PCDM::File
       end
-      it "retains origin pcdm.File RDF type" do
-        expect(subject.metadata_node.type).to include(::RDF::URI("http://pcdm.org/use#OriginalFile") )
-        expect(generic_file.original_file.metadata_node.type).to include(RDFVocabularies::PCDMTerms.File)
+      it 'retains origin pcdm.File RDF type' do
+        expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#OriginalFile'))
+        expect(generic_file.original_file.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
 
-    context "when building original file" do
+    context 'when building original file' do
       subject { generic_file.build_original_file }
-      it "initializes an unsaved File object with OrignalFile type" do
+      it 'initializes an unsaved File object with OrignalFile type' do
         expect(subject).to be_new_record
-        expect(subject.metadata_node.type).to include(::RDF::URI("http://pcdm.org/use#OriginalFile") )
-        expect(subject.metadata_node.type).to include(RDFVocabularies::PCDMTerms.File)
+        expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#OriginalFile'))
+        expect(subject.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
-
   end
 
-  describe "#extracted_text" do
-
-    context "when extracted text is present" do
+  describe '#extracted_text' do
+    context 'when extracted text is present' do
       before do
         extracted_text = generic_file.build_extracted_text
-        extracted_text.content = "extracted_text"
+        extracted_text.content = 'extracted_text'
       end
       subject { generic_file.extracted_text }
-      it "can be saved without errors" do
+      it 'can be saved without errors' do
         expect(subject.save).to be_truthy
       end
-      it "retrieves content of the extracted_text" do
-        expect(subject.content).to eql "extracted_text"
+      it 'retrieves content of the extracted_text' do
+        expect(subject.content).to eql 'extracted_text'
       end
-      it "retains origin pcdm.File RDF type" do
-        expect(subject.metadata_node.type).to include(::RDF::URI("http://pcdm.org/use#ExtractedText") )
-        expect(subject.metadata_node.type).to include(RDFVocabularies::PCDMTerms.File)
+      it 'retains origin pcdm.File RDF type' do
+        expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#ExtractedText'))
+        expect(subject.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
 
-    context "when building new extracted text object" do
+    context 'when building new extracted text object' do
       subject { generic_file.build_extracted_text }
-      it "initializes an unsaved File object with ExtractedText type" do
+      it 'initializes an unsaved File object with ExtractedText type' do
         expect(subject).to be_new_record
-        expect(subject.metadata_node.type).to include(::RDF::URI("http://pcdm.org/use#ExtractedText") )
-        expect(subject.metadata_node.type).to include(RDFVocabularies::PCDMTerms.File)
+        expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#ExtractedText'))
+        expect(subject.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
-
   end
-
 end

data/spec/hydra/works/models/concerns/generic_file/mime_types_spec.rb

@@ -1,76 +1,74 @@
 require 'spec_helper'
 
 describe Hydra::Works::GenericFile::MimeTypes do
-
   subject { Hydra::Works::GenericFile::Base.new }
 
-  describe "#pdf?" do
+  describe '#pdf?' do
     before do
       allow(subject).to receive(:mime_type).and_return('application/pdf')
     end
-    it "should be true" do
+    it 'is true' do
       expect(subject.pdf?).to be true
     end
   end
 
-  describe "#image?" do
+  describe '#image?' do
     before do
       allow(subject).to receive(:mime_type).and_return('image/jpeg')
     end
-    it "should be true" do
+    it 'is true' do
       expect(subject.image?).to be true
     end
   end
 
-  describe "#video?" do
+  describe '#video?' do
     before do
       allow(subject).to receive(:mime_type).and_return('video/mp4')
     end
-    it "should be true" do
+    it 'is true' do
       expect(subject.video?).to be true
     end
   end
 
-  describe "#audio?" do
+  describe '#audio?' do
     before do
       allow(subject).to receive(:mime_type).and_return('audio/mp3')
     end
-    it "should be true" do
+    it 'is true' do
       expect(subject.audio?).to be true
     end
   end
 
-  describe "#office_document?" do
+  describe '#office_document?' do
     before do
       allow(subject).to receive(:mime_type).and_return('application/msword')
     end
-    it "should be true" do
+    it 'is true' do
       expect(subject.office_document?).to be true
     end
   end
 
-  describe "#collection?" do
-    it "should be false" do
+  describe '#collection?' do
+    it 'is false' do
       expect(subject.collection?).to be false
     end
   end
 
-  describe "#file_format?" do
-    it "should handle both mime and format_label" do
+  describe '#file_format?' do
+    it 'handles both mime and format_label' do
       allow(subject).to receive(:mime_type).and_return('image/png')
       allow(subject).to receive(:format_label).and_return(['Portable Network Graphics'])
       expect(subject.file_format).to eq 'png (Portable Network Graphics)'
     end
-    it "should handle just mime type" do
+    it 'handles just mime type' do
       allow(subject).to receive(:mime_type).and_return('image/png')
       allow(subject).to receive(:format_label).and_return([])
       expect(subject.file_format).to eq 'png'
     end
-    it "should handle just format_label" do
+    it 'handles just format_label' do
       allow(subject).to receive(:mime_type).and_return('')
       allow(subject).to receive(:format_label).and_return(['Portable Network Graphics'])
       expect(subject.file_format).to eq ['Portable Network Graphics']
     end
   end
-
 end

data/spec/hydra/works/models/concerns/generic_file/versioned_content_spec.rb

@@ -1,31 +1,31 @@
 require 'spec_helper'
 
 describe Hydra::Works::GenericFile::VersionedContent do
-  let(:generic_file)  { Hydra::Works::GenericFile::Base.new }
+  let(:generic_file) { Hydra::Works::GenericFile::Base.new }
   before do
-    Hydra::Works::UploadFileToGenericFile.call(generic_file, File.open(File.join(fixture_path, "sample-file.pdf")))
-    Hydra::Works::UploadFileToGenericFile.call(generic_file, File.open(File.join(fixture_path, "updated-file.txt")))
+    Hydra::Works::UploadFileToGenericFile.call(generic_file, File.open(File.join(fixture_path, 'sample-file.pdf')))
+    Hydra::Works::UploadFileToGenericFile.call(generic_file, File.open(File.join(fixture_path, 'updated-file.txt')))
   end
 
-  describe "content_versions" do
-    subject {generic_file.content_versions}
-    it "lists all of the versions of original_file" do
+  describe 'content_versions' do
+    subject { generic_file.content_versions }
+    it 'lists all of the versions of original_file' do
       expect(subject.count).to eq(2)
-      expect(subject.map { |v| v.uri }).to eq(generic_file.original_file.versions.all.map { |v| v.uri })
+      expect(subject.map(&:uri)).to eq(generic_file.original_file.versions.all.map(&:uri))
     end
   end
 
-  describe "latest_content_version" do
+  describe 'latest_content_version' do
     subject { generic_file.latest_content_version }
-    it "returns the most recent version entry for original_file" do
+    it 'returns the most recent version entry for original_file' do
       # Can't use a simple equivalence because they are actually different ResourceVersion objects
       expect(subject.uri).to eq(generic_file.original_file.versions.last.uri)
       expect(subject.label).to eq(generic_file.original_file.versions.last.label)
     end
   end
 
-  describe "current_content_version_uri" do
-    it "returns the URI of the most recent version of original_file" do
+  describe 'current_content_version_uri' do
+    it 'returns the URI of the most recent version of original_file' do
       expect(generic_file.current_content_version_uri).to eq(generic_file.original_file.versions.last.uri)
     end
   end

data/spec/hydra/works/models/concerns/generic_file/virus_check_spec.rb

@@ -7,8 +7,13 @@ describe Hydra::Works::GenericFile::VirusCheck do
       include Hydra::Works::GenericFile::VirusCheck
     end
     class ClamAV
-      def self.instance; @instance ||= ClamAV.new; end
-      def scanfile(path); puts "scanfile: #{path}"; end
+      def self.instance
+        @instance ||= ClamAV.new
+      end
+
+      def scanfile(path)
+        puts "scanfile: #{path}"
+      end
     end
   end
   after do
@@ -25,26 +30,24 @@ describe Hydra::Works::GenericFile::VirusCheck do
   end
 
   context 'with an infected file' do
-
     before do
       expect(ClamAV.instance).to receive(:scanfile).and_return(1)
     end
-    it "should fail to save" do
+    it 'fails to save' do
       expect(subject.save).to eq false
     end
-    it "should fail to validate" do
+    it 'fails to validate' do
       expect(subject.validate).to eq false
     end
   end
 
-  context "with a clean file" do
+  context 'with a clean file' do
     before do
       expect(ClamAV.instance).to receive(:scanfile).and_return(0)
     end
 
-    it "should not detect viruses" do
+    it 'does not detect viruses' do
       expect(subject.detect_viruses).to eq true
     end
   end
-
 end

data/spec/hydra/works/models/concerns/generic_file_behavior_spec.rb

@@ -6,7 +6,7 @@ describe Hydra::Works::GenericFileBehavior do
   end
   subject { IncludesGenericFileBehavior.new }
 
-  it "ensures that objects will be recognized as generic_files" do
+  it 'ensures that objects will be recognized as generic_files' do
     expect(subject).to be_works_generic_file
   end
 end

data/spec/hydra/works/models/generic_file_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe Hydra::Works::GenericFile::Base do
-
-  let(:generic_file1) { Hydra::Works::GenericFile::Base.new }
+  let(:generic_file1) { described_class.new }
 
   describe 'Related objects' do
     let(:object1) { Hydra::PCDM::Object.new }
@@ -23,7 +22,7 @@ describe Hydra::Works::GenericFile::Base do
 
     before do
       file1.content = "I'm a file"
-      file2.content = "I am too"
+      file2.content = 'I am too'
       object.save!
     end
 
@@ -33,50 +32,48 @@ describe Hydra::Works::GenericFile::Base do
   end
 
   describe 'add related object' do
-
-    let(:subject) { Hydra::Works::GenericFile::Base.new }
+    let(:subject) { described_class.new }
 
     describe 'begin test' do
-
       context 'with acceptable related objects' do
         let(:object1) { Hydra::PCDM::Object.create }
         let(:object2) { Hydra::PCDM::Object.new }
         let(:generic_work1) { Hydra::Works::GenericWork::Base.create }
         let(:generic_work2) { Hydra::Works::GenericWork::Base.new }
-        let(:generic_file1) { Hydra::Works::GenericFile::Base.create }
+        let(:generic_file1) { described_class.create }
 
-        it 'should add various types of related objects to generic_file' do
+        it 'adds various types of related objects to generic_file' do
           subject.related_objects << generic_work1
           subject.related_objects << generic_file1
           subject.related_objects << object1
           subject.save
           subject.reload
           related_objects = subject.related_objects
-          expect( related_objects.include? generic_work1 ).to be true
-          expect( related_objects.include? generic_file1 ).to be true
-          expect( related_objects.include? object1 ).to be true
-          expect( related_objects.size ).to eq 3
+          expect(related_objects.include? generic_work1).to be true
+          expect(related_objects.include? generic_file1).to be true
+          expect(related_objects.include? object1).to be true
+          expect(related_objects.size).to eq 3
         end
 
         context 'with files and generic_files' do
           let(:file1) { subject.files.build }
           let(:file2) { subject.files.build }
-          
+
           before do
             subject.save
             file1.content = "I'm a file"
-            file2.content = "I am too"
+            file2.content = 'I am too'
             subject.related_objects << object1
           end
 
-          it 'should add a related object to a generic_file with files and generic_files' do
-            subject.related_objects << object2 
+          it 'adds a related object to a generic_file with files and generic_files' do
+            subject.related_objects << object2
             subject.save
             subject.reload
             related_objects = subject.related_objects
-            expect( related_objects.include? object1 ).to be true
-            expect( related_objects.include? object2 ).to be true
-            expect( related_objects.size ).to eq 2
+            expect(related_objects.include? object1).to be true
+            expect(related_objects.include? object2).to be true
+            expect(related_objects.size).to eq 2
           end
         end
       end
@@ -87,146 +84,151 @@ describe Hydra::Works::GenericFile::Base do
         let(:pcdm_file1)       { Hydra::PCDM::File.new }
         let(:non_PCDM_object)  { "I'm not a PCDM object" }
         let(:af_base_object)   { ActiveFedora::Base.new }
-        
+
         let(:error_message) { 'child_related_object must be a pcdm object' }
-        
-        it 'should NOT aggregate Hydra::Works::Collection in related objects aggregation' do
-          expect{ subject.related_objects << collection1 }.to raise_error(ActiveFedora::AssociationTypeMismatch, /Hydra::Works::Collection:.*> is not a PCDM object./)
+
+        it 'does not aggregate Hydra::Works::Collection in related objects aggregation' do
+          expect { subject.related_objects << collection1 }.to raise_error(ActiveFedora::AssociationTypeMismatch, /Hydra::Works::Collection:.*> is not a PCDM object./)
         end
 
-        it 'should NOT aggregate Hydra::PCDM::Collections in related objects aggregation' do
-          expect{ subject.related_objects << pcdm_collection1 }.to raise_error(ActiveFedora::AssociationTypeMismatch, /Hydra::PCDM::Collection:.*> is not a PCDM object./)
+        it 'does not aggregate Hydra::PCDM::Collections in related objects aggregation' do
+          expect { subject.related_objects << pcdm_collection1 }.to raise_error(ActiveFedora::AssociationTypeMismatch, /Hydra::PCDM::Collection:.*> is not a PCDM object./)
         end
 
-        it 'should NOT aggregate Hydra::PCDM::Files in related objects aggregation' do
-          expect{ subject.related_objects << pcdm_file1 }.to raise_error(ActiveFedora::AssociationTypeMismatch, /ActiveFedora::Base.* expected, got Hydra::PCDM::File.*/)
+        it 'does not aggregate Hydra::PCDM::Files in related objects aggregation' do
+          expect { subject.related_objects << pcdm_file1 }.to raise_error(ActiveFedora::AssociationTypeMismatch, /ActiveFedora::Base.* expected, got Hydra::PCDM::File.*/)
         end
 
-        it 'should NOT aggregate non-PCDM objects in related objects aggregation' do
-          expect{ subject.related_objects << non_PCDM_object }.to raise_error(ActiveFedora::AssociationTypeMismatch, /ActiveFedora::Base.* expected, got String.*/)
-      end
-        
-        it 'should NOT aggregate AF::Base objects in related objects aggregation' do
-          expect{ subject.related_objects << af_base_object }.to raise_error(ActiveFedora::AssociationTypeMismatch, /ActiveFedora::Base.* is not a PCDM object./)
-          
+        it 'does not aggregate non-PCDM objects in related objects aggregation' do
+          expect { subject.related_objects << non_PCDM_object }.to raise_error(ActiveFedora::AssociationTypeMismatch, /ActiveFedora::Base.* expected, got String.*/)
+        end
+
+        it 'does not aggregate AF::Base objects in related objects aggregation' do
+          expect { subject.related_objects << af_base_object }.to raise_error(ActiveFedora::AssociationTypeMismatch, /ActiveFedora::Base.* is not a PCDM object./)
         end
       end
-      
+
       context 'with invalid behaviors' do
         let(:object1) { Hydra::PCDM::Object.new }
         let(:object2) { Hydra::PCDM::Object.new }
 
-        it 'should NOT allow related objects to repeat' do
+        it 'does not allow related objects to repeat' do
           skip 'skipping this test because issue pcdm#92 needs to be addressed' do
-            subject.related_objects << object1   
+            subject.related_objects << object1
             subject.related_objects << object2
             subject.related_objects << object1
             subject.save
             subject.reload
             related_objects = subject.related_objects
-            expect( related_objects.include? object1 ).to be true
-            expect( related_objects.include? object2 ).to be true
-            expect( related_objects.size ).to eq 2
+            expect(related_objects.include? object1).to be true
+            expect(related_objects.include? object2).to be true
+            expect(related_objects.size).to eq 2
           end
         end
       end
     end
   end
- 
-  describe 'get related objects from generic file' do
 
-    subject { Hydra::Works::GenericFile::Base.new }
+  describe 'get related objects from generic file' do
+    subject { described_class.new }
 
     let(:object1) { Hydra::PCDM::Object.new }
     let(:object2) { Hydra::PCDM::Object.new }
 
     let(:generic_work1) { Hydra::Works::GenericWork::Base.new }
-    let(:generic_file1) { Hydra::Works::GenericFile::Base.new }
+    let(:generic_file1) { described_class.new }
 
     context 'with generic files' do
-      it 'should return empty array when only generic files are aggregated' do
-        expect( related_objects = subject.related_objects ).to eq []
+      it 'returns empty array when only generic files are aggregated' do
+        expect(subject.related_objects).to eq []
       end
 
-      it 'should return related objects' do
-        subject.related_objects << object2 
-        expect( related_objects = subject.related_objects ).to eq [object2]
+      it 'returns related objects' do
+        subject.related_objects << object2
+        expect(subject.related_objects).to eq [object2]
       end
 
-      it 'should return related objects of various types' do
-        subject.related_objects << generic_work1 
-        subject.related_objects << generic_file1 
+      it 'returns related objects of various types' do
+        subject.related_objects << generic_work1
+        subject.related_objects << generic_file1
         subject.related_objects << object1
         subject.save
         subject.reload
         related_objects = subject.related_objects
-        expect( related_objects.include? object1 ).to be true
-        expect( related_objects.include? generic_work1 ).to be true
-        expect( related_objects.include? generic_file1 ).to be true
-        expect( related_objects.size ).to eq 3
+        expect(related_objects.include? object1).to be true
+        expect(related_objects.include? generic_work1).to be true
+        expect(related_objects.include? generic_file1).to be true
+        expect(related_objects.size).to eq 3
       end
     end
   end
 
   describe 'remove related object from related object' do
-
-    subject { Hydra::Works::GenericFile::Base.new }
+    subject { described_class.new }
 
     let(:related_object1) { Hydra::PCDM::Object.new }
     let(:related_work2)   { Hydra::Works::GenericWork::Base.new }
-    let(:related_file3)   { Hydra::Works::GenericFile::Base.new }
+    let(:related_file3)   { described_class.new }
     let(:related_object4) { Hydra::PCDM::Object.new }
     let(:related_work5)   { Hydra::Works::GenericWork::Base.new }
 
-    let(:generic_file1) { Hydra::Works::GenericFile::Base.new }
-    let(:generic_file2) { Hydra::Works::GenericFile::Base.new }
+    let(:generic_file1) { described_class.new }
+    let(:generic_file2) { described_class.new }
 
     context 'when multiple related objects' do
       before do
-        subject.related_objects << related_object1 
+        subject.related_objects << related_object1
         subject.related_objects << related_work2
         subject.related_objects << related_file3
-        subject.related_objects << related_object4 
-        subject.related_objects << related_work5 
-        expect( related_ojects = subject.related_objects ).to eq [related_object1,related_work2,related_file3,related_object4,related_work5]
-
+        subject.related_objects << related_object4
+        subject.related_objects << related_work5
+        expect(subject.related_objects).to eq [related_object1, related_work2, related_file3, related_object4, related_work5]
       end
 
-      it 'should remove first related object' do
-        expect( subject.related_objects.delete related_object1 ).to eq [related_object1]
-        expect( related_objects = subject.related_objects).to eq [related_work2,related_file3,related_object4,related_work5]
+      it 'removes first related object' do
+        expect(subject.related_objects.delete related_object1).to eq [related_object1]
+        expect(subject.related_objects).to eq [related_work2, related_file3, related_object4, related_work5]
       end
 
-      it 'should remove last related object' do
-        expect( subject.related_objects.delete related_work5 ).to eq [related_work5]
-        expect( related_objects = subject.related_objects ).to eq [related_object1,related_work2,related_file3,related_object4]
+      it 'removes last related object' do
+        expect(subject.related_objects.delete related_work5).to eq [related_work5]
+        expect(subject.related_objects).to eq [related_object1, related_work2, related_file3, related_object4]
       end
 
-      it 'should remove middle related object' do
-        expect( subject.related_objects.delete related_file3  ).to eq [related_file3]
-        expect( related_objects = subject.related_objects ).to eq [related_object1,related_work2,related_object4,related_work5]
+      it 'removes middle related object' do
+        expect(subject.related_objects.delete related_file3).to eq [related_file3]
+        expect(subject.related_objects).to eq [related_object1, related_work2, related_object4, related_work5]
       end
     end
 
-    #Assuming this context not needed because unacceptable related objects 
-    #can't be added.
-    #context 'with unacceptable related object' do
-
+    # Assuming this context not needed because unacceptable related objects
+    # can't be added.
+    # context 'with unacceptable related object' do
   end
 
-  describe "should have parent work accessors" do
+  describe 'should have parent work accessors' do
     let(:generic_work1) { Hydra::Works::GenericWork::Base.create }
     before do
       generic_work1.generic_files << generic_file1
     end
 
-    it 'should have parents' do
-      expect(generic_file1.parents).to eq [generic_work1]
+    it 'has parents' do
+      expect(generic_file1.member_of).to eq [generic_work1]
     end
-    it 'should have a parent work' do
-      expect(generic_file1.generic_works).to eq [generic_work1]
+    it 'has a parent work' do
+      expect(generic_file1.in_generic_works).to eq [generic_work1]
     end
   end
 
-
+  describe 'make sure deprecated methods still work' do
+    let(:generic_work1) { Hydra::Works::GenericWork::Base.create }
+    before do
+      generic_work1.generic_files << generic_file1
+      generic_work1.save # required until issue AF-Agg-75 is fixed
+    end
+    it 'deprecated methods should pass' do
+      expect(generic_file1.generic_works).to eq [generic_work1]
+      expect(generic_file1.parents).to eq [generic_work1]
+    end
+  end
 end