active-fedora 10.3.0 → 11.0.0.rc1

data/spec/integration/rdf_nested_attributes_spec.rb

@@ -9,7 +9,7 @@ describe "Nesting attribute behavior of RDF resources" do
     end
 
     class CustomName < ActiveFedora::Base
-      property :pref_label, predicate: ::RDF::SKOS.prefLabel, multiple: false
+      property :pref_label, predicate: ::RDF::Vocab::SKOS.prefLabel, multiple: false
     end
 
     class CustomSource < ActiveFedora::Base
@@ -52,11 +52,11 @@ describe "Nesting attribute behavior of RDF resources" do
 
       it "sets the attributes" do
         expect(subject.topic.size).to eq 2
-        expect(subject.topic.map(&:subject)).to eq [['Foo'], ['Bar']]
+        expect(subject.topic.map(&:subject)).to contain_exactly ['Foo'], ['Bar']
       end
 
       it "marks the attributes as changed" do
-        expect(subject.changed_attributes).to eq('topic' => [])
+        expect(subject.changed_attributes.keys).to eq ["topic"]
       end
     end
 

data/spec/integration/relation_delegation_spec.rb

@@ -28,11 +28,11 @@ describe ActiveFedora::Base do
     subject { TestClass.where(bar: 'Peanuts') }
 
     it "maps" do
-      expect(subject.map(&:id)).to eq [instance2.id, instance3.id]
+      expect(subject.map(&:id)).to contain_exactly instance2.id, instance3.id
     end
 
     it "collects" do
-      expect(subject.collect(&:id)).to eq [instance2.id, instance3.id]
+      expect(subject.collect(&:id)).to contain_exactly instance2.id, instance3.id
     end
 
     it "has each" do

data/spec/integration/scoped_query_spec.rb

@@ -68,13 +68,13 @@ describe ActiveFedora::Querying do
         expect(ModelIntegrationSpec::Basic.where('foo' => ['Beta', 'Alpha'])).to eq [test_instance1, test_instance2]
       end
       it "orders" do
-        expect(ModelIntegrationSpec::Basic.order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' asc')).to eq [test_instance2, test_instance1, test_instance3]
+        expect(ModelIntegrationSpec::Basic.order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' asc')).to contain_exactly test_instance2, test_instance1, test_instance3
       end
       it "limits" do
         expect(ModelIntegrationSpec::Basic.limit(1)).to eq [test_instance1]
       end
       it "offsets" do
-        expect(ModelIntegrationSpec::Basic.offset(1)).to eq [test_instance2, test_instance3]
+        expect(ModelIntegrationSpec::Basic.offset(1)).to contain_exactly test_instance2, test_instance3
       end
 
       it "chains queries" do
@@ -127,7 +127,7 @@ describe ActiveFedora::Querying do
       end
       it "logs an error" do
         expect(ActiveFedora::Base.logger).to receive(:error).with("Although #{id} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
-        expect(ModelIntegrationSpec::Basic.all).to eq [test_instance1, test_instance3]
+        expect(ModelIntegrationSpec::Basic.all).to contain_exactly test_instance1, test_instance3
       end
     end
   end

data/spec/integration/solr_hit_spec.rb

@@ -29,15 +29,4 @@ describe ActiveFedora::SolrHit do
       expect(subject.title).to eq 'My Title'
     end
   end
-
-  describe "#instantiate_with_json" do
-    subject { solr_hit.instantiate_with_json }
-
-    it { is_expected.to be_persisted }
-
-    it "finds the document in solr" do
-      expect(subject).to be_instance_of Foo
-      expect(subject.title).to eq 'My Title'
-    end
-  end
 end

data/spec/integration/versionable_spec.rb

@@ -106,7 +106,7 @@ describe ActiveFedora::Versionable do
           end
 
           it "will return to the first version's values" do
-            expect(subject.title).to eql(["Greetings Earthlings"])
+            expect(subject.title).to eq(["Greetings Earthlings"])
           end
 
           context "and creating additional versions" do
@@ -118,7 +118,7 @@ describe ActiveFedora::Versionable do
 
             it "has three versions" do
               expect(subject.versions.all.size).to eq 3
-              expect(subject.title).to eql(["Now, surrender and prepare to be boarded"])
+              expect(subject.title).to eq(["Now, surrender and prepare to be boarded"])
             end
           end
         end
@@ -179,7 +179,7 @@ describe ActiveFedora::Versionable do
         end
 
         it "has a title" do
-          expect(subject.title).to eql(["Greetings Earthlings"])
+          expect(subject.title).to eq(["Greetings Earthlings"])
         end
 
         it "has a size" do
@@ -202,7 +202,7 @@ describe ActiveFedora::Versionable do
           end
 
           it "has the new title" do
-            expect(subject.title).to eql(["Surrender and prepare to be boarded"])
+            expect(subject.title).to eq(["Surrender and prepare to be boarded"])
           end
 
           it "has a new size" do
@@ -221,7 +221,7 @@ describe ActiveFedora::Versionable do
             end
 
             it "loads the restored file's content" do
-              expect(subject.title).to eql(["Greetings Earthlings"])
+              expect(subject.title).to eq(["Greetings Earthlings"])
             end
 
             it "is the same size as the original file" do
@@ -240,7 +240,7 @@ describe ActiveFedora::Versionable do
               end
 
               it "has a new title" do
-                expect(subject.title).to eql(["Now, surrender and prepare to be boarded"])
+                expect(subject.title).to eq(["Now, surrender and prepare to be boarded"])
               end
 
               it "has a new size" do

data/spec/integration/with_metadata_spec.rb

@@ -30,7 +30,7 @@ describe ActiveFedora::WithMetadata do
       file.title = ['one', 'two']
     end
     it "sets and retrieve properties" do
-      expect(file.title).to eq ['one', 'two']
+      expect(file.title).to contain_exactly 'one', 'two'
     end
 
     it "tracks changes" do

data/spec/samples/hydra-mods_article_datastream.rb

@@ -253,8 +253,7 @@ module Hydra
         "edt" => "Editor",
         "ill" => "Illustrator",
         "oth" => "Other",
-        "trl" => "Translator"
-       }
+        "trl" => "Translator" }
     end
 
     def self.person_relator_terms
@@ -268,8 +267,7 @@ module Hydra
         "res" => "Researcher",
         "rth" => "Research team head",
         "rtm" => "Research team member",
-        "trl" => "Translator"
-       }
+        "trl" => "Translator" }
     end
 
     def self.conference_relator_terms

data/spec/unit/base_spec.rb

@@ -72,8 +72,8 @@ describe ActiveFedora::Base do
     context "on an inherited class" do
       before do
         class Agent < ActiveFedora::Base
-          rdf_label ::RDF::FOAF.name
-          property :foaf_name, predicate: ::RDF::FOAF.name
+          rdf_label ::RDF::Vocab::FOAF.name
+          property :foaf_name, predicate: ::RDF::Vocab::FOAF.name
         end
         class Person < Agent
           rdf_label ::RDF::URI('http://example.com/foo')
@@ -141,7 +141,6 @@ describe ActiveFedora::Base do
 
       context "with an id argument" do
         it "is able to create with a custom id" do
-          expect(Deprecation).to receive(:warn)
           expect(FooHistory).to receive(:id_to_uri).and_call_original
           f = FooHistory.new('baz_1')
           expect(f.id).to eq 'baz_1'
@@ -260,7 +259,7 @@ describe ActiveFedora::Base do
             end
 
             it "updates the resource" do
-              expect(test_object.resource.rdf_subject).to eq ::RDF::URI.new("#{ActiveFedora.fedora.base_uri}/#{@this_id}")
+              expect(test_object.resource.rdf_subject).to eq ::RDF::URI.new("#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{@this_id}")
               expect(test_object.title).to eq ['foo']
             end
           end

data/spec/unit/core/fedora_id_translator_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
   describe ".call" do
     let(:result) { described_class.call(id) }
     context "when given an id" do
-      let(:good_uri) { ActiveFedora.fedora.base_uri + "/banana" }
+      let(:good_uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/banana" }
       let(:id) { "banana" }
       it "returns a fedora URI" do
         expect(result).to eq good_uri
@@ -18,7 +18,7 @@ RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
       end
 
       context "with characters that need escaping" do
-        let(:good_uri) { ActiveFedora.fedora.base_uri + "/%5Bfrob%5D" }
+        let(:good_uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/%5Bfrob%5D" }
         let(:id) { "[frob]" }
         it "returns a good fedora URI" do
           expect(result).to eq good_uri

data/spec/unit/core/fedora_uri_translator_spec.rb

@@ -4,13 +4,13 @@ RSpec.describe ActiveFedora::Core::FedoraUriTranslator do
   describe ".call" do
     let(:result) { described_class.call(uri) }
     context "when given a Fedora URI" do
-      let(:uri) { ActiveFedora.fedora.base_uri + "/6" }
+      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "/6" }
       it "returns the id" do
         expect(result).to eq '6'
       end
     end
     context "when given a URI missing a slash" do
-      let(:uri) { ActiveFedora.fedora.base_uri + "602-a" }
+      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path + "602-a" }
       it "returns the id" do
         expect(result).to eq "602-a"
       end

data/spec/unit/core_spec.rb

@@ -109,7 +109,7 @@ describe ActiveFedora::Base do
     subject { described_class.id_to_uri(id) }
 
     context "with no custom proc is set" do
-      it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/123456w" }
+      it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/123456w" }
       it "justs call #translate_id_to_uri" do
         allow(described_class).to receive(:translate_id_to_uri).and_call_original
         allow(ActiveFedora::Core::FedoraIdTranslator).to receive(:call).and_call_original
@@ -122,11 +122,11 @@ describe ActiveFedora::Base do
 
     context "when custom proc is set" do
       before do
-        described_class.translate_id_to_uri = lambda { |id| "#{ActiveFedora.fedora.base_uri}/foo/#{id}" }
+        described_class.translate_id_to_uri = lambda { |id| "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/#{id}" }
       end
       after { described_class.translate_id_to_uri = nil }
 
-      it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
+      it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
     end
 
     context "with an empty base path" do
@@ -145,8 +145,8 @@ describe ActiveFedora::Base do
   end
 
   describe "uri_to_id" do
-    let(:uri) { "#{ActiveFedora.fedora.base_uri}/foo/123456w" }
-    subject(:uri_id) { described_class.uri_to_id(uri) }
+    let(:uri) { "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/foo/123456w" }
+    subject { described_class.uri_to_id(uri) }
 
     context "with no custom proc is set" do
       it { should eq 'foo/123456w' }

data/spec/unit/fedora_spec.rb

@@ -8,8 +8,7 @@ describe ActiveFedora::Fedora do
         { url: "https://example.com",
           user: "fedoraAdmin",
           password: "fedoraAdmin",
-          ssl: { ca_path: '/path/to/certs' }
-        }
+          ssl: { ca_path: '/path/to/certs' } }
       }
       specify {
         expect(Faraday).to receive(:new).with("https://example.com", ssl: { ca_path: '/path/to/certs' }).and_call_original

data/spec/unit/file_spec.rb

@@ -51,14 +51,14 @@ describe ActiveFedora::File do
       context "and it's initialized with the URI" do
         let(:file) { described_class.new(parent.uri + "/FOO1") }
         it "works" do
-          expect(subject.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
+          expect(subject.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
         end
       end
 
       context "and it's initialized with an ID" do
         let(:file) { described_class.new(parent.id + "/FOO1") }
         it "works" do
-          expect(subject.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
+          expect(subject.to_s).to eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/1234/FOO1"
         end
       end
     end

data/spec/unit/filter_spec.rb

@@ -55,7 +55,7 @@ describe ActiveFedora::Associations::FilterAssociation do
         image.child_collections = [another_collection]
       end
       it "overwrites existing matches" do
-        expect(image.members).to eq [test_object, another_collection]
+        expect(image.members).to contain_exactly test_object, another_collection
       end
     end
   end
@@ -75,7 +75,7 @@ describe ActiveFedora::Associations::FilterAssociation do
       end
 
       it "updates the parent" do
-        expect(image.members).to eq [test_object, test_collection, another_collection]
+        expect(image.members).to contain_exactly test_object, test_collection, another_collection
       end
     end
   end
@@ -128,6 +128,6 @@ describe ActiveFedora::Associations::FilterAssociation do
 
     subject { image.members }
 
-    it { is_expected.to eq [test_collection, another_object] }
+    it { is_expected.to contain_exactly test_collection, another_object }
   end
 end

data/spec/unit/forbidden_attributes_protection_spec.rb

@@ -24,8 +24,8 @@ describe ActiveFedora::Attributes, ".new" do
     end
 
     class Person < ActiveFedora::Base
-      property :first_name, predicate: ::RDF::FOAF.firstName, multiple: false
-      property :gender, predicate: ::RDF::FOAF.gender, multiple: false
+      property :first_name, predicate: ::RDF::Vocab::FOAF.firstName, multiple: false
+      property :gender, predicate: ::RDF::Vocab::FOAF.gender, multiple: false
     end
   end
 

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -18,7 +18,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
       Object.send(:remove_const, :Book)
       Object.send(:remove_const, :Page)
     end
-    subject { Book.new(id: 'subject-a') }
+    subject { Book.new('subject-a') }
 
     context "a one way relationship " do
       describe "adding memeber" do
@@ -114,7 +114,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
         it "clears the object set" do
           expect(collection.members).to eq [thing]
           collection.member_ids = [thing2.id, thing3.id]
-          expect(collection.members).to eq [thing2, thing3]
+          expect(collection.members).to contain_exactly thing2, thing3
         end
       end
 

data/spec/unit/has_many_association_spec.rb

@@ -12,8 +12,8 @@ describe ActiveFedora::Associations::HasManyAssociation do
     Object.send(:remove_const, :Book)
     Object.send(:remove_const, :Page)
   end
-  let(:book) { Book.new(id: 'subject-a') }
-  let(:page) { Page.new(id: 'object-b') }
+  let(:book) { Book.new('subject-a') }
+  let(:page) { Page.new('object-b') }
 
   describe "setting the foreign key" do
     before do
@@ -32,34 +32,19 @@ describe ActiveFedora::Associations::HasManyAssociation do
     end
   end
 
-  describe "#find_polymorphic_inverse" do
+  describe "Finding a polymorphic inverse relation" 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::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) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, book_reflection) }
 
-    subject(:inverse) { association.send(:find_polymorphic_inverse, page) }
-
-    context "when a has_many is present" 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::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
-
-      it "finds the HABTM reflection" do
-        expect(inverse.name).to eq :contents
-      end
-    end
-
-    context "when multiple belongs_to are present" do
-      before do
-        # :foo must come first, so that we can test that is being passed over in favor of :bar
-        Page.belongs_to :foo, predicate: ::RDF::Vocab::DC.isPartOf, class_name: 'ActiveFedora::Base'
-        Page.belongs_to :bar, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-      end
+    subject { association.send(:find_polymorphic_inverse, page) }
 
-      it "finds the belongs_to reflection" do
-        expect(inverse.name).to eq :bar
-      end
+    it "finds the HABTM reflection" do
+      expect(subject.name).to eq :contents
     end
   end
 

data/spec/unit/ntriples_datastream_spec.rb

@@ -20,8 +20,8 @@ EOF
         property :publisher, predicate: ::RDF::Vocab::DC.publisher
         property :creator, predicate: ::RDF::Vocab::DC.creator
         property :educationLevel, predicate: ::RDF::Vocab::DC.educationLevel
-        property :based_near, predicate: ::RDF::FOAF.based_near
-        property :related_url, predicate: ::RDF::RDFS.seeAlso
+        property :based_near, predicate: ::RDF::Vocab::FOAF.based_near
+        property :related_url, predicate: ::RDF::Vocab::RDFS.seeAlso
       end
       @subject = MyDatastream.new(ActiveFedora::Base.id_to_uri('/test:1/descMetadata'))
       @subject.content = remote_content
@@ -55,9 +55,6 @@ EOF
       expect(val).to eq ["0. Title of work"]
     end
 
-    it "returns fields that are not TermProxies" do
-      expect(@subject.created).to be_kind_of Array
-    end
     it "has method missing" do
       expect(lambda { @subject.frank }).to raise_exception NoMethodError
     end
@@ -72,7 +69,7 @@ EOF
     end
     it "appends fields" do
       @subject.publisher << "St. Martin's Press"
-      expect(@subject.publisher).to eq ["Penn State", "St. Martin's Press"]
+      expect(@subject.publisher).to contain_exactly "Penn State", "St. Martin's Press"
     end
     it "deletes fields" do
       @subject.related_url.delete(RDF::URI("http://google.com/"))
@@ -98,8 +95,8 @@ EOF
         property :created, predicate: ::RDF::Vocab::DC.created
         property :title, predicate: ::RDF::Vocab::DC.title
         property :publisher, predicate: ::RDF::Vocab::DC.publisher
-        property :based_near, predicate: ::RDF::FOAF.based_near
-        property :related_url, predicate: ::RDF::RDFS.seeAlso
+        property :based_near, predicate: ::RDF::Vocab::FOAF.based_near
+        property :related_url, predicate: ::RDF::Vocab::RDFS.seeAlso
       end
       @subject = MyDatastream.new
       allow(@subject).to receive(:id).and_return 'test:1'
@@ -132,7 +129,7 @@ EOF
       Object.send(:remove_const, :MyDatastream)
     end
 
-    it "supports to_s method" do
+    xit "supports to_s method" do
       expect(@subject.publisher.to_s).to eq [].to_s
       @subject.publisher = "Bob"
       expect(@subject.publisher.to_s).to eq ["Bob"].to_s

data/spec/unit/ordered_spec.rb

@@ -58,16 +58,6 @@ describe ActiveFedora::Orders do
     end
   end
 
-  it "can load from solr" do
-    member = Member.new
-    subject.ordered_members << member
-    subject.save!
-    solr_doc = ActiveFedora::SolrService.query("id:#{subject.id}").first
-
-    allow(Deprecation).to receive(:warn)
-    expect { ActiveFedora::Base.load_instance_from_solr(subject.id, solr_doc) }.not_to raise_error
-  end
-
   describe "#ordered_members" do
     describe "<<" do
       it "appends" do
@@ -98,7 +88,7 @@ describe ActiveFedora::Orders do
         subject.ordered_members = [member_2, member_2]
         expect(subject.ordered_members).to eq [member_2, member_2]
         # Removing from ordering is not the same as removing from aggregation.
-        expect(subject.members).to eq [member, member_2]
+        expect(subject.members).to contain_exactly member, member_2
       end
     end
     describe "+=" do
@@ -135,6 +125,12 @@ describe ActiveFedora::Orders do
           expect(subject.ordered_members.delete(member)).to eq member
           expect(subject.ordered_members.to_a).to eq [member_2]
         end
+        it "can delete all" do
+          expect(subject.ordered_members.delete(member)).to eq member
+          expect(subject.ordered_members.delete(member_2)).to eq member_2
+          subject.save!
+          expect(subject.reload.ordered_members.to_a).to eq []
+        end
       end
 
       context "with an object not found in the list" do
@@ -227,6 +223,7 @@ describe ActiveFedora::Orders do
       subject.save
       subject.reload
       expect(subject.ordered_members).to eq [member, member]
+      expect(subject.ordered_member_ids).to eq [member.id, member.id]
       expect(subject.list_source.resource.query([nil, ::RDF::Vocab::ORE.proxyIn, subject.resource.rdf_subject]).to_a.length).to eq 2
       expect(subject.head_ids).to eq subject.list_source.head_id
       expect(subject.tail_ids).to eq subject.list_source.tail_id