active-fedora 11.1.3 → 11.2.1

data/spec/integration/attached_files_spec.rb

@@ -37,11 +37,10 @@ describe ActiveFedora::AttachedFiles do
       end
     end
 
+    subject { ds.content }
     let(:file) { DSTest.create }
     let(:ds) { file.test_ds }
 
-    subject { ds.content }
-
     after do
       Object.send(:remove_const, :DSTest)
     end

data/spec/integration/collection_association_spec.rb

@@ -157,8 +157,8 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :Foo)
       end
 
-      let(:instance) { Foo::Container.new }
       subject { instance.items }
+      let(:instance) { Foo::Container.new }
 
       it { is_expected.to eq [] }
     end

data/spec/integration/direct_container_spec.rb

@@ -16,8 +16,8 @@ describe "Direct containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no files" do
-        let(:o) { FooHistory.new }
         subject { o.files }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }
@@ -124,8 +124,8 @@ describe "Direct containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no files" do
-        let(:o) { FooHistory.new }
         subject { o.files }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }

data/spec/integration/fedora_solr_sync_spec.rb

@@ -17,8 +17,8 @@ describe "fedora_solr_sync_issues" do
     Object.send(:remove_const, :ParentThing)
   end
 
-  let(:parent) { ParentThing.create }
   subject(:child) { ChildThing.create parent: parent }
+  let(:parent) { ParentThing.create }
 
   before { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, child.uri).delete }
 

data/spec/integration/generators/fedora_generator_spec.rb

@@ -4,7 +4,7 @@ require 'generators/active_fedora/config/fedora/fedora_generator'
 describe ActiveFedora::Config::FedoraGenerator do
   describe "#fcrepo_wrapper_config" do
     let(:generator) { described_class.new }
-    let(:files_to_test) {[
+    let(:files_to_test) { [
       'config/fcrepo_wrapper_test.yml',
       '.fcrepo_wrapper'
     ]}

data/spec/integration/generators/solr_generator_spec.rb

@@ -4,7 +4,7 @@ require 'generators/active_fedora/config/solr/solr_generator'
 describe ActiveFedora::Config::SolrGenerator do
   describe "#solr_wrapper_config" do
     let(:generator) { described_class.new }
-    let(:files_to_test) {[
+    let(:files_to_test) { [
       'config/solr_wrapper_test.yml',
       '.solr_wrapper'
     ]}

data/spec/integration/has_many_associations_spec.rb

@@ -28,17 +28,17 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
 
       context "when the owner is not saved, and potential targets (Books) exist" do
+        subject { library.books.count }
         let!(:book) { Book.create }
         let(:library) { Library.new }
-        subject { library.books.count }
         # it excludes the books that aren't associated
         it { is_expected.to eq 0 }
       end
 
       context "when the owner is saved with associations" do
+        subject { library.reload; library.books.count }
         let(:book) { Book.create }
         let!(:library) { Library.create(books: [book]) }
-        subject { library.reload; library.books.count }
         # it excludes the books that are associated
         it { is_expected.to eq 1 }
       end
@@ -55,13 +55,13 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
 
       context "loading the association prior to a save that affects the association" do
-        let(:library) { Library.new }
         before do
           Book.create
           library.books
           library.save
         end
         subject { library.books.size }
+        let(:library) { Library.new }
         it { is_expected.to eq 0 }
       end
     end
@@ -396,8 +396,6 @@ describe ActiveFedora::Associations::HasManyAssociation do
         Object.send(:remove_const, :Library)
       end
 
-      let(:library) { Library.create }
-
       before do
         library.books.create(title: ["Great Book"])
         library.books.first.title = ["Better book"]
@@ -405,6 +403,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
 
       subject(:books) { library.books(true) }
+      let(:library) { Library.create }
 
       it "saves the new title" do
         expect(books.first.title).to eq ["Better book"]

data/spec/integration/indexing_spec.rb

@@ -43,13 +43,33 @@ describe ActiveFedora::Base do
       end
     end
 
+    describe "when some of the descendants are prioritized models" do
+      around do |example|
+        class PriorityModel < ActiveFedora::Base
+        end
+        original_defaults = ActiveFedora::Indexing::DescendantFetcher.default_priority_models
+        ActiveFedora::Indexing::DescendantFetcher.default_priority_models = ["PriorityModel"]
+
+        example.run
+
+        ActiveFedora::Indexing::DescendantFetcher.default_priority_models = original_defaults
+        Object.send(:remove_const, :PriorityModel)
+      end
+      let(:ids) { ['foo', 'bar'] }
+      let!(:priority_models) { [PriorityModel.create, PriorityModel.create] }
+
+      it "puts prioritized model ids first" do
+        expect(described_class.descendant_uris(ActiveFedora.fedora.base_uri).slice(0..(priority_models.count - 1))).to contain_exactly(*priority_models.collect(&:uri).collect(&:to_s))
+      end
+    end
+
     describe "reindex_everything" do
       let(:ids) { ['foo', 'bar'] }
       let(:solr) { ActiveFedora::SolrService.instance.conn }
       before do
         solr.delete_by_query('*:*', params: { 'softCommit' => true })
       end
-      it "calls update_index on every object represented in the sitemap" do
+      it "adds object to solr" do
         expect {
           described_class.reindex_everything
         }.to change { ActiveFedora::SolrService.query('id:foo').size }.from(0).to(1)

data/spec/integration/indirect_container_spec.rb

@@ -114,8 +114,8 @@ describe "Indirect containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no related_objects" do
-        let(:o) { FooHistory.new }
         subject { o.related_objects }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }
@@ -263,8 +263,8 @@ describe "Indirect containers" do
       let(:reloaded) { FooHistory.find(o.id) }
 
       context "with no related_objects" do
-        let(:o) { FooHistory.new }
         subject { o.related_objects }
+        let(:o) { FooHistory.new }
 
         it { is_expected.to be_empty }
         it { is_expected.to eq [] }

data/spec/integration/solr_hit_spec.rb

@@ -11,6 +11,7 @@ describe ActiveFedora::SolrHit do
     Object.send(:remove_const, :Foo)
   end
 
+  subject(:solr_hit) { described_class.new(doc) }
   let(:another) { Foo.create }
 
   let!(:obj) { Foo.create!(
@@ -19,7 +20,6 @@ describe ActiveFedora::SolrHit do
   ) }
 
   let(:doc) { obj.to_solr }
-  subject(:solr_hit) { described_class.new(doc) }
 
   describe "#reify" do
     let(:solr_reified) { solr_hit.reify }

data/spec/integration/versionable_spec.rb

@@ -32,6 +32,8 @@ describe ActiveFedora::Versionable do
     end
 
     describe 'sorting versions' do
+      subject(:graph) { ActiveFedora::VersionsGraph.new }
+
       before do
         allow(graph).to receive(:fedora_versions) { versions }
       end
@@ -40,8 +42,6 @@ describe ActiveFedora::Versionable do
       let(:version2) { instance_double(ActiveFedora::VersionsGraph::ResourceVersion, uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e790373a67-c9ee-447d-b740-4faa882b1a1f', label: 'version2', created: '2015-04-02T19:54:45.96Z') }
       let(:versions) { [version1, version2] }
 
-      subject(:graph) { ActiveFedora::VersionsGraph.new }
-
       it 'sorts by DateTime' do
         expect(graph.first).to eq version2
       end

data/spec/unit/attached_files_spec.rb

@@ -110,20 +110,25 @@ describe ActiveFedora::AttachedFiles do
   end
 
   describe "#accessor_name" do
-    it "uses the name" do
-      expect(af_base.send(:accessor_name, 'abc')).to eq 'abc'
+    subject { af_base.send(:accessor_name, value) }
+    context "with lowercase" do
+      let(:value) { 'abc' }
+      it { is_expected.to eq 'abc' }
     end
 
-    it "uses the name" do
-      expect(af_base.send(:accessor_name, 'ARCHIVAL_XML')).to eq 'ARCHIVAL_XML'
+    context "with uppercase" do
+      let(:value) { 'ARCHIVAL_XML' }
+      it { is_expected.to eq 'ARCHIVAL_XML' }
     end
 
-    it "uses the name" do
-      expect(af_base.send(:accessor_name, 'descMetadata')).to eq 'descMetadata'
+    context "with camelcase" do
+      let(:value) { 'descMetadata' }
+      it { is_expected.to eq 'descMetadata' }
     end
 
-    it "hash-erizes underscores" do
-      expect(af_base.send(:accessor_name, 'a-b')).to eq 'a_b'
+    context "with dashes" do
+      let(:value) { 'a-b' }
+      it { is_expected.to eq 'a_b' }
     end
   end
 
@@ -187,4 +192,27 @@ describe ActiveFedora::AttachedFiles do
       expect(af_base.metadata_streams).to_not include(file_ds)
     end
   end
+
+  context "When the resource is using idiomatic basic containment" do
+    before do
+      class Sample1 < ActiveFedora::Base
+        is_a_container
+      end
+    end
+    after do
+      Object.send(:remove_const, :Sample1)
+    end
+
+    before do
+      child = obj.contains.build
+      child.content = "Stuff"
+      child.save!
+    end
+    let(:obj) { Sample1.create! }
+    let(:obj2) { Sample1.find(obj.id) }
+
+    it "doesn't conflate attached_file and contains" do
+      expect(obj2.attached_files.keys).to be_empty
+    end
+  end
 end

data/spec/unit/attributes_spec.rb

@@ -15,8 +15,8 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :BarHistory4)
     end
 
-    let(:obj) { BarHistory4.new(title: ['test1']) }
     subject(:history) { obj }
+    let(:obj) { BarHistory4.new(title: ['test1'], id: 'test:123') }
 
     describe "#attribute_names" do
       context "on an instance" do
@@ -34,15 +34,7 @@ describe ActiveFedora::Base do
 
     describe "#inspect" do
       it "shows the attributes" do
-        expect(history.inspect).to eq "#<BarHistory4 id: nil, title: [\"test1\"], abstract: nil>"
-      end
-
-      describe "with a id" do
-        before { allow(history).to receive(:id).and_return('test:123') }
-
-        it "shows a id" do
-          expect(history.inspect).to eq "#<BarHistory4 id: \"test:123\", title: [\"test1\"], abstract: nil>"
-        end
+        expect(history.inspect).to eq "#<BarHistory4 id: \"test:123\", title: [\"test1\"], abstract: nil>"
       end
 
       describe "with no attributes" do
@@ -60,8 +52,8 @@ describe ActiveFedora::Base do
           history.library = library
         end
 
-        let(:library) { BarHistory4.create }
         subject(:history) { BarHistory2.new }
+        let(:library) { BarHistory4.create }
 
         after do
           Object.send(:remove_const, :BarHistory2)
@@ -98,7 +90,7 @@ describe ActiveFedora::Base do
               history.resource[:abstract] = ['foo', 'bar']
             end
             it "raises an error if just returning the first value would cause data loss" do
-              expect { history[:abstract] }.to raise_error ActiveFedora::ConstraintError, "Expected \"abstract\" to have 0-1 statements, but there are 2"
+              expect { history[:abstract] }.to raise_error ActiveFedora::ConstraintError, "Expected \"abstract\" of test:123 to have 0-1 statements, but there are 2"
             end
           end
         end
@@ -144,7 +136,7 @@ describe ActiveFedora::Base do
       it "does not allow an enumerable to a unique attribute writer" do
         expect { history.abstract = "Low" }.not_to raise_error
         expect { history.abstract = ["Low"]
-        }.to raise_error ArgumentError, "You attempted to set the property `abstract' to an enumerable value. However, this property is declared as singular."
+        }.to raise_error ArgumentError, "You attempted to set the property `abstract' of test:123 to an enumerable value. However, this property is declared as singular."
         expect { history.abstract = nil }.not_to raise_error
       end
     end

data/spec/unit/base_spec.rb

@@ -63,8 +63,8 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :FooHistory)
       end
 
-      let(:instance) { FooHistory.new(title: ['A label']) }
       subject { instance.rdf_label }
+      let(:instance) { FooHistory.new(title: ['A label']) }
 
       it { is_expected.to eq ['A label'] }
     end
@@ -88,8 +88,8 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :Creator)
       end
 
-      let(:instance) { Creator.new(foaf_name: ['Carolyn'], job: ['Developer']) }
       subject { instance.rdf_label }
+      let(:instance) { Creator.new(foaf_name: ['Carolyn'], job: ['Developer']) }
 
       it { is_expected.to eq ['Developer'] }
     end

data/spec/unit/callback_spec.rb

@@ -24,7 +24,7 @@ describe ActiveFedora::Base do
     Object.send(:remove_const, :CallbackStub)
   end
 
-  it "has after_initialize, before_save,after_save, before_create, after_create, after_update, before_update, before_destroy" do
+  it "has after_initialize, before_save, after_save, before_create, after_create" do
     allow_any_instance_of(CallbackStub).to receive(:a_init)
     allow_any_instance_of(CallbackStub).to receive :b_create
     allow_any_instance_of(CallbackStub).to receive :a_create
@@ -34,7 +34,7 @@ describe ActiveFedora::Base do
     @cb.save
   end
 
-  it "has after_initialize, before_save,after_save, before_create, after_create, after_update, before_update, before_destroy" do
+  it "has after_initialize, before_save, after_save, before_create, after_create, after_update, before_update, before_destroy" do
     allow_any_instance_of(CallbackStub).to receive(:a_init)
     allow_any_instance_of(CallbackStub).to receive(:b_create)
     allow_any_instance_of(CallbackStub).to receive(:a_create)

data/spec/unit/change_set_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::ChangeSet do
-  let(:change_set) { described_class.new(base, base.resource, base.changed_attributes.keys) }
-  subject { change_set }
+  subject(:change_set) { described_class.new(base, base.resource, base.changed_attributes.keys) }
 
   context "with an unchanged object" do
     let(:base) { ActiveFedora::Base.new }

data/spec/unit/collection_proxy_spec.rb

@@ -14,11 +14,12 @@ describe ActiveFedora::Associations::CollectionProxy do
   end
 
   describe "#spawn" do
+    subject { proxy.spawn }
+
     let(:reflection)  { ActiveFedora::Reflection.create(:has_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
     let(:association) { ActiveFedora::Associations::HasManyAssociation.new(Book.new, reflection) }
     let(:proxy)       { described_class.new(association) }
 
-    subject { proxy.spawn }
     it { is_expected.to be_instance_of ActiveFedora::Relation }
   end
 end

data/spec/unit/core_spec.rb

@@ -11,8 +11,8 @@ describe ActiveFedora::Base do
     end
   end
 
-  let(:library) { Library.create }
   subject(:book) { Book.new(library: library, title: "War and Peace", publisher: "Random House") }
+  let(:library) { Library.create }
 
   after do
     Object.send(:remove_const, :Book)
@@ -117,8 +117,8 @@ describe ActiveFedora::Base do
   end
 
   describe "id_to_uri" do
-    let(:id) { '123456w' }
     subject(:uri) { described_class.id_to_uri(id) }
+    let(:id) { '123456w' }
 
     context "with no custom proc is set" do
       it { is_expected.to eq "#{ActiveFedora.fedora.base_uri}/123456w" }
@@ -157,8 +157,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.base_uri}/foo/123456w" }
 
     context "with no custom proc is set" do
       it { is_expected.to eq 'foo/123456w' }

data/spec/unit/default_model_mapper_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe ActiveFedora::DefaultModelMapper do
+  subject(:mapper) { described_class.new classifier_class: classifier, solr_field: solr_field, predicate: predicate }
   let(:classifier) { class_double(ActiveFedora::ModelClassifier) }
   let(:classifier_instance) { instance_double(ActiveFedora::ModelClassifier) }
   let(:solr_field) { 'solr_field' }
   let(:predicate) { 'info:predicate' }
-  subject(:mapper) { described_class.new classifier_class: classifier, solr_field: solr_field, predicate: predicate }
 
   describe '#classifier' do
     context 'with a solr document' do

data/spec/unit/file_path_builder_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe ActiveFedora::FilePathBuilder do
   describe ".build" do
-    let(:parent) { ActiveFedora::Base.new(id: '1234') }
     subject { described_class.build(parent, nil, 'FOO') }
+    let(:parent) { ActiveFedora::Base.new(id: '1234') }
 
     it { is_expected.to eq 'FOO1' }