active-fedora 9.0.0.rc3 → 9.0.0

data/spec/integration/nested_attribute_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "NestedAttribute behavior" do
   before do
     class Bar < ActiveFedora::Base
-      belongs_to :car, predicate: ActiveFedora::RDF::RelsExt.hasMember
+      belongs_to :car, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember
       has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
         m.field "uno", :string
         m.field "dos", :string
@@ -13,7 +13,7 @@ describe "NestedAttribute behavior" do
 
     # base Car class, used in test for association updates and :allow_destroy flag
     class Car < ActiveFedora::Base
-      has_many :bars, predicate: ActiveFedora::RDF::RelsExt.hasMember
+      has_many :bars, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember
       accepts_nested_attributes_for :bars, :allow_destroy=>true
     end
 

data/spec/integration/relation_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   before :all do
     class Library < ActiveFedora::Base
-      has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
     class Book < ActiveFedora::Base; end
   end

data/spec/integration/solr_instance_loader_spec.rb

@@ -11,7 +11,7 @@ describe ActiveFedora::SolrInstanceLoader do
       has_attributes :bar, datastream: 'descMetadata', multiple: false
       property :title, predicate: ::RDF::DC.title, multiple: false
       property :description, predicate: ::RDF::DC.description
-      belongs_to :another, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'Foo'
+      belongs_to :another, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'Foo'
     end
   end
 
@@ -35,6 +35,7 @@ describe ActiveFedora::SolrInstanceLoader do
         expect(subject.title).to eq 'My Title'
         expect(subject.description).to match_array ['first desc', 'second desc']
         expect(subject.another_id).to eq another.id
+        expect(subject.bar).to eq 'quix'
       end
 
       it "should not be mutable" do

data/spec/samples/special_thing.rb

@@ -37,8 +37,8 @@ class SpecialThing < ActiveFedora::Base
 
   # This is an example of how you can add a custom relationship to a model
   # This will allow you to call .derivation on instances of the model to get the _outbound_ "hasDerivation" relationship in the RELS-EXT datastream
-  belongs_to :derivation, predicate: ActiveFedora::RDF::RelsExt.hasDerivation, class_name: 'SpecialThing'
+  belongs_to :derivation, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasDerivation, class_name: 'SpecialThing'
 
   # This will allow you to call .inspirations on instances of the model to get a list of all of the objects that assert "hasDerivation" relationships pointing at this object
-  has_many :inspirations, predicate: ActiveFedora::RDF::RelsExt.hasDerivation, class_name: 'SpecialThing'
+  has_many :inspirations, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasDerivation, class_name: 'SpecialThing'
 end

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ require 'byebug' unless ENV['TRAVIS']
 
 ActiveFedora::Base.logger = Logger.new(STDERR)
 ActiveFedora::Base.logger.level = Logger::WARN
+# require 'http_logger'
 # HttpLogger.logger = Logger.new(STDOUT)
 # HttpLogger.ignore = [/localhost:8983\/solr/]
 # HttpLogger.colorize = false

data/spec/unit/attached_files_spec.rb

@@ -92,7 +92,7 @@ describe ActiveFedora::AttachedFiles do
     end
   end
 
-  describe "#add_file_datastream" do
+  describe "#add_file" do
     before do
       class Bar < ActiveFedora::File; end
 
@@ -107,17 +107,53 @@ describe ActiveFedora::AttachedFiles do
     end
     let(:container) { FooHistory.new }
 
-    context "a reflection matches the :dsid property" do
+    describe "#add_file_datastream" do
+      context "a reflection matches the :dsid property" do
+        it "should build the reflection" do
+          expect(Deprecation).to receive(:warn)
+          container.add_file_datastream('blah', path: 'content')
+          expect(container.content).to be_instance_of Bar
+          expect(container.content.content).to eq 'blah'
+        end
+      end
+    end
+    context "with the deprecated :dsid property" do
+      it "should build the reflection" do
+        expect(Deprecation).to receive(:warn)
+        container.add_file('blah', dsid: 'content')
+        expect(container.content).to be_instance_of Bar
+        expect(container.content.content).to eq 'blah'
+      end
+    end
+    context "a reflection matches the :path property" do
+      it "should build the reflection" do
+        container.add_file('blah', path: 'content')
+        expect(container.content).to be_instance_of Bar
+        expect(container.content.content).to eq 'blah'
+      end
+    end
+
+    context "the deprecated 3 args erasure" do
+      it "should build the reflection" do
+        expect(Deprecation).to receive(:warn)
+        container.add_file('blah', 'content', 'name.png')
+        expect(container.content).to be_instance_of Bar
+        expect(container.content.content).to eq 'blah'
+      end
+    end
+
+    context "the deprecated 4 args erasure" do
       it "should build the reflection" do
-        container.add_file_datastream('blah', dsid: 'content')
+        expect(Deprecation).to receive(:warn)
+        container.add_file('blah', 'content', 'name.png', 'image/png')
         expect(container.content).to be_instance_of Bar
         expect(container.content.content).to eq 'blah'
       end
     end
 
-    context "no reflection matches the :dsid property" do
+    context "no reflection matches the :path property" do
       it "should create a singleton reflection and build it" do
-        container.add_file_datastream('blah', dsid: 'fizz')
+        container.add_file('blah', path: 'fizz')
         expect(container.fizz).to be_instance_of ActiveFedora::File
         expect(container.fizz.content).to eq 'blah'
       end

data/spec/unit/attributes_spec.rb

@@ -105,7 +105,7 @@ describe ActiveFedora::Base do
         describe "with relationships" do
           before do
             class BarHistory3 < BarHistory2
-              belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent, class_name: 'BarHistory2'
+              belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent, class_name: 'BarHistory2'
             end
             subject.library = library
           end

data/spec/unit/change_set_spec.rb

@@ -16,7 +16,7 @@ describe ActiveFedora::ChangeSet do
       end
 
       class Book < ActiveFedora::Base
-        belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+        belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
         property :title, predicate: ::RDF::DC.title
       end
 

data/spec/unit/code_configurator_spec.rb

@@ -18,9 +18,9 @@ describe ActiveFedora::FileConfigurator do
       :fedora_config => { :url => 'http://codeconfig.example.edu/fedora/', :user => 'fedoraAdmin', :password => 'configurator', :cert_file => '/path/to/cert/file' },
       :solr_config => { :url => 'http://codeconfig.example.edu/solr/' },
       :predicate_config => { 
-        :default_namespace => 'http://fedora.info/definitions/v4/rels-ext#',
+        :default_namespace => 'info:fedora/fedora-system:def/relations-external#',
         :predicate_mapping => {
-          'http://fedora.info/definitions/v4/rels-ext#' => { :has_part => 'hasPart' } 
+          'info:fedora/fedora-system:def/relations-external#' => { :has_part => 'hasPart' } 
         }
       }
     }
@@ -45,7 +45,7 @@ describe ActiveFedora::FileConfigurator do
     ActiveFedora.init(@config_params)
     expect(ActiveFedora.fedora_config.credentials).to eq @config_params[:fedora_config]
     expect(ActiveFedora.solr_config).to eq @config_params[:solr_config]
-    expect(ActiveFedora::Predicates.predicate_mappings['http://fedora.info/definitions/v4/rels-ext#'].length).to eq 1
+    expect(ActiveFedora::Predicates.predicate_mappings['info:fedora/fedora-system:def/relations-external#'].length).to eq 1
   end
   
 end

data/spec/unit/core_spec.rb

@@ -8,7 +8,7 @@ describe ActiveFedora::Base do
     class Library < ActiveFedora::Base
     end
     class Book < ActiveFedora::Base
-      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+      belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
       has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
         m.field "title", :string
       end
@@ -104,6 +104,20 @@ describe ActiveFedora::Base do
 
       it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
     end
+
+    context "with an empty base path" do
+      it "should produce a valid URI" do
+        allow(ActiveFedora.fedora).to receive(:base_path).and_return("/")    
+        expect(subject).to eq("#{ActiveFedora.fedora.host}/#{id}")
+      end
+    end
+
+    context "with a really empty base path" do
+      it "should produce a valid URI" do
+        allow(ActiveFedora.fedora).to receive(:base_path).and_return("")    
+        expect(subject).to eq("#{ActiveFedora.fedora.host}/#{id}")
+      end
+    end
   end
 
   describe "uri_to_id" do
@@ -123,4 +137,5 @@ describe ActiveFedora::Base do
       it { should eq '123456w' }
     end
   end
+
 end

data/spec/unit/file_spec.rb

@@ -27,13 +27,6 @@ describe ActiveFedora::Datastream do
     end
   end
 
-  describe "to_param" do
-    before { allow(subject).to receive(:dsid).and_return('foo.bar') }
-    it "should escape dots" do
-      expect(subject.to_param).to eq 'foo%2ebar'
-    end
-  end
-
   describe "#uri" do
     let(:parent) { ActiveFedora::Base.new(id: '1234') }
     before { allow(Deprecation).to receive(:warn) }
@@ -189,12 +182,23 @@ describe ActiveFedora::Datastream do
     context "when it's saved" do
       let(:parent) { ActiveFedora::Base.create }
       before do
-        parent.add_file_datastream('one1two2threfour', dsid: 'abcd', mime_type: 'video/webm', original_name: "my_image.png")
+        parent.add_file('one1two2threfour', path: 'abcd', mime_type: 'video/webm', original_name: 'my image.png')
         parent.save!
       end
 
       it "should have original_name" do
-        expect(parent.reload.abcd.original_name).to eq 'my_image.png'
+        expect(parent.reload.abcd.original_name).to eq 'my image.png'
+      end
+    end
+
+    context "with special characters" do
+      let(:parent) { ActiveFedora::Base.create }
+      before do
+        parent.add_file('one1two2threfour', path: 'abcd', mime_type: 'video/webm', original_name:'my "image".png')
+        parent.save!
+      end
+      it "should save OK and preserve name" do
+        expect(parent.reload.abcd.original_name).to eq 'my "image".png'
       end
     end
   end
@@ -209,7 +213,7 @@ describe ActiveFedora::Datastream do
     context "when it's saved" do
       let(:parent) { ActiveFedora::Base.create }
       before do
-        parent.add_file_datastream('one1two2threfour', dsid: 'abcd', mime_type: 'video/webm')
+        parent.add_file('one1two2threfour', path: 'abcd', mime_type: 'video/webm')
         parent.save!
       end
 

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -24,7 +24,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     context "a one way relationship " do
       describe "adding memeber" do
         it "should set the relationship attribute" do
-          reflection = Book.create_reflection(:has_and_belongs_to_many, :pages, {predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection}, Book)
+          reflection = Book.create_reflection(:has_and_belongs_to_many, :pages, {predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection}, Book)
           allow(ActiveFedora::SolrService).to receive(:query).and_return([])
           ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, reflection)
           expect(ac).to receive(:callback).twice
@@ -46,7 +46,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
         let(:query2) { ids.slice(10,10).map {|i| "_query_:\"{!raw f=id}#{i}\""}.join(" OR ") }
 
         it "should call solr query multiple times" do
-          reflection = Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection, solr_page_size: 10}, Book)
+          reflection = Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection, solr_page_size: 10}, Book)
           expect(subject).to receive(:[]).with('page_ids').and_return(ids)
           expect(ActiveFedora::SolrService).to receive(:query).with(query1, rows: 10).and_return([])
           expect(ActiveFedora::SolrService).to receive(:query).with(query2, rows: 10).and_return([])
@@ -58,8 +58,8 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     end
 
     context "with an inverse reflection" do
-      let!(:inverse) { Page.create_reflection(:has_and_belongs_to_many, :books, { predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection }, Page) }
-      let(:reflection) { Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::RelsExt.hasCollectionMember, inverse_of: 'books'}, Book) }
+      let!(:inverse) { Page.create_reflection(:has_and_belongs_to_many, :books, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Page) }
+      let(:reflection) { Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, inverse_of: 'books'}, Book) }
       let(:ac) { ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, reflection) }
       let(:object) { Page.new }
 
@@ -84,13 +84,13 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
   context "class with association" do
     before do
       class Collection < ActiveFedora::Base
-        has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base", after_remove: :remove_member
+        has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base", after_remove: :remove_member
         def remove_member (m)
         end
       end
 
       class Thing < ActiveFedora::Base
-        has_many :collections, predicate: ActiveFedora::RDF::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base"
+        has_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base"
       end
     end
 

data/spec/unit/has_many_association_spec.rb

@@ -22,7 +22,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       allow(ActiveFedora::SolrService).to receive(:query).and_return([])
     end
 
-    let(:reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::RelsExt.isPartOf }, Book) }
+    let(:reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { ActiveFedora::Associations::HasManyAssociation.new(book, reflection) }
 
     it "should set the book_id attribute" do
@@ -36,10 +36,10 @@ describe ActiveFedora::Associations::HasManyAssociation do
 
     before do
       # :books must come first, so that we can test that is being passed over in favor of :contents
-      Page.has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-      Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
     end
-    let(:book_reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::RelsExt.isPartOf }, Book) }
+    let(:book_reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { ActiveFedora::Associations::HasManyAssociation.new(book, book_reflection) }
 
     subject { association.send(:find_polymorphic_inverse, page) }

data/spec/unit/indexing_service_spec.rb

@@ -10,8 +10,8 @@ describe ActiveFedora::IndexingService do
     let(:location_reflection) { double('location', foreign_key: 'location_id', kind_of?: true, solr_key: part_of) }
     let(:reflections) { { 'person' => person_reflection, 'location' => location_reflection } }
 
-    let(:member_of) { ActiveFedora::SolrQueryBuilder.solr_name("http://fedora.info/definitions/v4/rels-ext#isMemberOf", :symbol) }
-    let(:part_of) { ActiveFedora::SolrQueryBuilder.solr_name("http://fedora.info/definitions/v4/rels-ext#isPartOf", :symbol) }
+    let(:member_of) { ActiveFedora::SolrQueryBuilder.solr_name("info:fedora/fedora-system:def/relations-external#isMemberOf", :symbol) }
+    let(:part_of) { ActiveFedora::SolrQueryBuilder.solr_name("info:fedora/fedora-system:def/relations-external#isPartOf", :symbol) }
 
     before do
       expect(object).to receive(:[]).with('person_id').and_return('info:fedora/demo:10')

data/spec/unit/ldp_resource_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe ActiveFedora::LdpResource do
+  let(:obj) { ActiveFedora::Base.create! }
+  let!(:r1) { ActiveFedora::LdpResource.new(ActiveFedora.fedora.connection, obj.uri) }
+  let!(:r2) { ActiveFedora::LdpResource.new(ActiveFedora.fedora.connection, obj.uri) }
+
+  it "should cache requests" do
+    expect_any_instance_of(Faraday::Connection).to receive(:get).once.and_call_original
+    ActiveFedora::Base.cache do
+      r1.get
+      r2.get
+    end
+  end
+
+
+end

data/spec/unit/logger_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  let(:logger1) { double }
+  let(:logger1) { double(debug?: false) }
 
   before do
     @initial_logger = ActiveFedora::Base.logger

data/spec/unit/persistence_spec.rb

@@ -2,39 +2,43 @@ require 'spec_helper'
 
 describe ActiveFedora::Persistence do
 
-  describe "an unsaved object" do
-    subject { ActiveFedora::Base.new }
-    it "should be deleteable (nop) and return the object" do
-      expect(subject.delete).to eq subject
+  describe '.delete' do
+    context 'with an unsaved object' do
+      subject { ActiveFedora::Base.new }
+      before { subject.delete }
+      it { is_expected.to eq subject }
+    end
+
+    context 'with a saved object' do
+      subject { ActiveFedora::Base.create! }
+      before { subject.delete }
+      it { is_expected.to be_frozen }
     end
   end
 
-  describe ".create" do
-    context "when a block is provided" do
-      it "should pass the block to initialize" do
+  describe '.create' do
+    context 'when a block is provided' do
+      it 'passes the block to initialize' do
         expect_any_instance_of(ActiveFedora::Base).to receive(:save)
         expect { |b| ActiveFedora::Base.create(&b) }.to yield_with_args(an_instance_of ActiveFedora::Base)
       end
     end
   end
 
-  describe "a saved object" do
+  describe '.destroy' do
     subject { ActiveFedora::Base.create! }
-    describe "that is deleted" do
-      before do
-        subject.delete
-      end
-      it "should be frozen" do
-        expect(subject).to be_frozen
+    context 'with no options' do
+      before { subject.destroy }
+      it 'does not clear the id' do
+        expect(subject.id).not_to be_nil
       end
     end
-  end
 
-  describe "destroy" do
-    subject { ActiveFedora::Base.create! }
-    it "should not clear the id" do
-      subject.destroy
-      expect(subject.id).not_to be_nil
+    context 'with option eradicate: true' do
+      it 'deletes the tombstone' do
+        expect(subject.class).to receive(:eradicate).with(subject.id).and_return(true)
+        subject.destroy(eradicate: true)
+      end
     end
   end
 

data/spec/unit/predicates_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora::Predicates do
   end
   
   it 'should provide .default_predicate_namespace' do
-    expect(ActiveFedora::Predicates.default_predicate_namespace).to eq 'http://fedora.info/definitions/v4/rels-ext#'
+    expect(ActiveFedora::Predicates.default_predicate_namespace).to eq 'info:fedora/fedora-system:def/relations-external#'
   end
  
   describe "#predicate_mappings" do 
@@ -37,7 +37,7 @@ describe ActiveFedora::Predicates do
       expect(ActiveFedora::Predicates.predicate_mappings).to be_kind_of Hash
     end
 
-    it "should provide mappings to the fedora ontology via the http://fedora.info/definitions/v4/rels-ext# default namespace mapping" do
+    it "should provide mappings to the fedora ontology via the info:fedora/fedora-system:def/relations-external# default namespace mapping" do
       expect(ActiveFedora::Predicates.predicate_mappings.keys.include?(ActiveFedora::Predicates.default_predicate_namespace)).to be true
       expect(ActiveFedora::Predicates.predicate_mappings[ActiveFedora::Predicates.default_predicate_namespace]).to be_kind_of Hash
     end
@@ -94,7 +94,7 @@ describe ActiveFedora::Predicates do
     end
     
     it 'should allow explicit initialization of predicates' do
-      expect(ActiveFedora::Predicates.find_predicate(:is_part_of)).to eq ["isPartOf", "http://fedora.info/definitions/v4/rels-ext#"]
+      expect(ActiveFedora::Predicates.find_predicate(:is_part_of)).to eq ["isPartOf", "info:fedora/fedora-system:def/relations-external#"]
       ActiveFedora::Predicates.predicate_config = {
         :default_namespace => 'http://example.com/foo',
         :predicate_mapping => {
@@ -112,17 +112,17 @@ describe ActiveFedora::Predicates do
     it "should allow adding predicates without wiping out existing predicates" do
       ActiveFedora::Predicates.set_predicates({
                                                   "http://projecthydra.org/ns/relations#"=>{has_profile:"hasProfile"},
-                                                  "http://fedora.info/definitions/v4/rels-ext#"=>{
+                                                  "info:fedora/fedora-system:def/relations-external#"=>{
                                                       references:"references",
                                                       has_derivation: "cameFrom"
                                                   },
                                               })
       # New & Modified Predicates
       expect(ActiveFedora::Predicates.find_predicate(:has_profile)).to eq ["hasProfile", "http://projecthydra.org/ns/relations#"]
-      expect(ActiveFedora::Predicates.find_predicate(:references)).to eq ["references", "http://fedora.info/definitions/v4/rels-ext#"]
-      expect(ActiveFedora::Predicates.find_predicate(:has_derivation)).to eq ["cameFrom", "http://fedora.info/definitions/v4/rels-ext#"]
+      expect(ActiveFedora::Predicates.find_predicate(:references)).to eq ["references", "info:fedora/fedora-system:def/relations-external#"]
+      expect(ActiveFedora::Predicates.find_predicate(:has_derivation)).to eq ["cameFrom", "info:fedora/fedora-system:def/relations-external#"]
       # Pre-Existing predicates should be unharmed
-      expect(ActiveFedora::Predicates.find_predicate(:is_part_of)).to eq ["isPartOf", "http://fedora.info/definitions/v4/rels-ext#"]
+      expect(ActiveFedora::Predicates.find_predicate(:is_part_of)).to eq ["isPartOf", "info:fedora/fedora-system:def/relations-external#"]
       expect(ActiveFedora::Predicates.find_predicate(:is_governed_by)).to eq ["isGovernedBy", "http://projecthydra.org/ns/relations#"]
     end