active-fedora 11.0.0.rc7 → 11.0.0

data/spec/integration/versionable_spec.rb

@@ -36,8 +36,8 @@ describe ActiveFedora::Versionable do
         allow(graph).to receive(:fedora_versions) { versions }
       end
 
-      let(:version1) { double('version1', uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e711aa993d-e1d2-4a65-93ee-3a12fc9541ab', label: 'version1', created: '2015-04-02T19:54:45.962Z') }
-      let(:version2) { double('version2', 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(:version1) { instance_double(ActiveFedora::VersionsGraph::ResourceVersion, uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e711aa993d-e1d2-4a65-93ee-3a12fc9541ab', label: 'version1', created: '2015-04-02T19:54:45.962Z') }
+      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 }
@@ -47,7 +47,7 @@ describe ActiveFedora::Versionable do
       end
 
       context 'with an unparseable created date' do
-        let(:version2) { double('version2', 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: '') }
+        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: '') }
 
         it 'raises an exception' do
           expect { graph.first }.to raise_error(ActiveFedora::VersionLacksCreateDate)
@@ -60,7 +60,7 @@ describe ActiveFedora::Versionable do
           allow(version2).to receive(:created) { raise NoMethodError }
         end
 
-        let(:version2) { double('version2', 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') }
+        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') }
 
         it 'raises an exception' do
           expect { graph.first }.to raise_error(ActiveFedora::VersionLacksCreateDate)

data/spec/spec_helper.rb

@@ -44,10 +44,59 @@ RSpec.configure do |config|
       $stderr.puts e.message
     end
   end
-  config.after(:each) do
-    # cleanout_fedora
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
-  config.order = :random if ENV['CI']
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end
 
 def fixture(file)

data/spec/unit/active_fedora_spec.rb

@@ -85,7 +85,7 @@ describe ActiveFedora do
     end
 
     describe "within rails" do
-      after(:each) do
+      after do
         unstub_rails
       end
 

data/spec/unit/association_hash_spec.rb

@@ -3,60 +3,46 @@ require 'spec_helper'
 describe ActiveFedora::AssociationHash do
   subject(:association_hash) { described_class.new(model, reflections) }
 
-  let(:model) { double(association: nil) }
-  let(:reflections) { double(keys: [:foo]) }
+  let(:model) { instance_double(ActiveFedora::Base, association: nil) }
+  let(:reflections) { { foo: association } }
   let(:reader) { double("reader") }
   let(:writer) { double("writer") }
   let(:association) { double(reader: reader, writer: writer) }
 
+  before do
+    allow(model).to receive(:association).with(:foo).and_return(association)
+  end
+
   describe "key reader" do
     describe "when the association exists" do
-      before do
-        allow(association_hash).to receive(:association).with("foo") { association }
-      end
       it "calls the association reader" do
         expect(association_hash["foo"]).to eq(reader)
       end
     end
     describe "when the association does not exist" do
-      before do
-        allow(association_hash).to receive(:association).with("foo") { nil }
-      end
       it "returns nil" do
-        expect(association_hash["foo"]).to be_nil
+        expect(association_hash["bar"]).to be_nil
       end
     end
   end
 
   describe "key setter" do
     let(:obj) { double }
-    before do
-      allow(association).to receive(:writer).with(obj) { writer }
-    end
     describe "when the association exists" do
-      before do
-        allow(association_hash).to receive(:association).with("foo") { association }
-      end
       it "calls the association writer" do
         expect(association).to receive(:writer).with(obj)
         association_hash["foo"] = obj
       end
     end
     describe "when the association does not exist" do
-      before do
-        allow(association_hash).to receive(:association).with("foo") { nil }
-      end
       it "doesn't call the association writer" do
         expect(association).not_to receive(:writer).with(obj)
-        association_hash["foo"] = obj
+        association_hash["bar"] = obj
       end
     end
   end
 
   describe "#association" do
-    before do
-      allow(model).to receive(:association).with(:foo) { association }
-    end
     it "works with a string key" do
       expect(association_hash.association("foo")).to eq(association)
     end

data/spec/unit/attached_files_spec.rb

@@ -99,8 +99,8 @@ describe ActiveFedora::AttachedFiles do
 
   describe "#serialize_attached_files" do
     it "touches each file" do
-      m1 = double
-      m2 = double
+      m1 = instance_double(ActiveFedora::File)
+      m2 = instance_double(ActiveFedora::File)
 
       expect(m1).to receive(:serialize!)
       expect(m2).to receive(:serialize!)
@@ -178,10 +178,10 @@ describe ActiveFedora::AttachedFiles do
 
   describe "#metadata_streams" do
     it "only is metadata datastreams" do
-      ds1 = double(metadata?: true)
-      ds2 = double(metadata?: true)
-      ds3 = double(metadata?: true)
-      file_ds = double(metadata?: false)
+      ds1 = instance_double(ActiveFedora::File, metadata?: true)
+      ds2 = instance_double(ActiveFedora::File, metadata?: true)
+      ds3 = instance_double(ActiveFedora::File, metadata?: true)
+      file_ds = instance_double(ActiveFedora::File, metadata?: false)
       allow(af_base).to receive(:attached_files).and_return(a: ds1, b: ds2, c: ds3, e: file_ds)
       expect(af_base.metadata_streams).to include(ds1, ds2, ds3)
       expect(af_base.metadata_streams).to_not include(file_ds)

data/spec/unit/base_cma_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  before(:each) do
+  before do
     @test_object = described_class.new
   end
 

data/spec/unit/base_extra_spec.rb

@@ -4,11 +4,11 @@ describe ActiveFedora::Base do
   subject(:object) { described_class.new }
   describe ".update_index" do
     before do
-      mock_conn = double("SolrConnection")
+      mock_conn = instance_double(RSolr::Client)
       expect(mock_conn).to receive(:add) do |_, opts|
         expect(opts).to eq(params: { softCommit: true })
       end
-      mock_ss = double("SolrService")
+      mock_ss = instance_double(ActiveFedora::SolrService)
       allow(mock_ss).to receive(:conn).and_return(mock_conn)
       allow(ActiveFedora::SolrService).to receive(:instance).and_return(mock_ss)
     end
@@ -30,20 +30,4 @@ describe ActiveFedora::Base do
       object.delete
     end
   end
-
-  describe "to_class_uri" do
-    before :all do
-      module SpecModel
-        class CamelCased < ActiveFedora::Base
-        end
-      end
-    end
-
-    after :all do
-      Object.send(:remove_const, :SpecModel)
-    end
-    subject { SpecModel::CamelCased.to_class_uri }
-
-    it { should == 'SpecModel::CamelCased' }
-  end
 end

data/spec/unit/base_spec.rb

@@ -274,7 +274,7 @@ describe ActiveFedora::Base do
 
     describe "#create" do
       it "builds a new record and save it" do
-        obj = double
+        obj = instance_double(FooHistory)
         expect(obj).to receive(:save)
         expect(FooHistory).to receive(:new).and_return(obj)
         FooHistory.create(fubar: 'ta')

data/spec/unit/callback_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  before :each do
+  before do
     class CallbackStub < ActiveFedora::Base
       after_initialize :a_init
       before_save :b_save
@@ -19,7 +19,7 @@ describe ActiveFedora::Base do
       end
     end
   end
-  after :each do
+  after do
     @cb.destroy if @cb && @cb.persisted? # this only is called if the test failed to run all the way through.
     Object.send(:remove_const, :CallbackStub)
   end

data/spec/unit/checksum_spec.rb

@@ -7,7 +7,7 @@ module ActiveFedora
     let(:uri) { ::RDF::URI("urn:sha1:bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }
 
     describe "when initialized with a file having a digest" do
-      let(:file) { double(digest: [uri]) }
+      let(:file) { instance_double(ActiveFedora::File, digest: [uri]) }
 
       its(:uri) { is_expected.to eq(uri) }
       its(:value) { is_expected.to eq("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }
@@ -15,7 +15,7 @@ module ActiveFedora
     end
 
     describe "when initialized with a file not having a digest" do
-      let(:file) { double(digest: []) }
+      let(:file) { instance_double(ActiveFedora::File, digest: []) }
 
       its(:uri) { is_expected.to be_nil }
       its(:value) { is_expected.to be_nil }

data/spec/unit/code_configurator_spec.rb

@@ -18,7 +18,7 @@ describe ActiveFedora::FileConfigurator do
     }
   end
 
-  before :each do
+  before do
     ActiveFedora.configurator = TestConfigurator.new
   end
 

data/spec/unit/core_spec.rb

@@ -169,4 +169,40 @@ describe ActiveFedora::Base do
       it { should eq '123456w' }
     end
   end
+
+  describe "to_class_uri" do
+    before do
+      module SpecModel
+        class CamelCased < ActiveFedora::Base
+        end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :SpecModel)
+    end
+    subject do
+      Deprecation.silence(ActiveFedora::Core::ClassMethods) do
+        SpecModel::CamelCased.to_class_uri
+      end
+    end
+
+    it { is_expected.to eq 'SpecModel::CamelCased' }
+  end
+
+  describe "to_rdf_representation" do
+    before do
+      module SpecModel
+        class CamelCased < ActiveFedora::Base
+        end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :SpecModel)
+    end
+    subject { SpecModel::CamelCased.to_rdf_representation }
+
+    it { is_expected.to eq 'SpecModel::CamelCased' }
+  end
 end

data/spec/unit/default_model_mapper_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe ActiveFedora::DefaultModelMapper do
-  let(:classifier) { double }
-  let(:classifier_instance) { double }
+  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 }
@@ -25,7 +25,7 @@ describe ActiveFedora::DefaultModelMapper do
         RDF::Graph.new << [:hello, predicate, 'xyz']
       end
 
-      let(:resource) { double(graph: graph) }
+      let(:resource) { instance_double(ActiveFedora::LdpResource, graph: graph) }
 
       before do
         expect(classifier).to receive(:new).with(['xyz']).and_return(classifier_instance)

data/spec/unit/file_configurator_spec.rb

@@ -105,12 +105,12 @@ describe ActiveFedora::FileConfigurator do
       end
 
       context "no solr.yml in same directory as fedora.yml and fedora.yml does not contain solr url" do
-        before :each do
+        before do
           allow(configurator).to receive(:config_options).and_return({})
           expect(configurator).to receive(:path).and_return("/path/to/fedora/config/fedora.yml")
           expect(File).to receive(:file?).with("/path/to/fedora/config/solr.yml").and_return(false)
         end
-        after :each do
+        after do
           unstub_rails
         end
 
@@ -137,7 +137,7 @@ describe ActiveFedora::FileConfigurator do
     end
 
     describe "load_fedora_config" do
-      before(:each) do
+      before do
         configurator.reset!
       end
       it "loads the file specified in fedora_config_path" do
@@ -169,7 +169,7 @@ describe ActiveFedora::FileConfigurator do
     end
 
     describe "load_solr_config" do
-      before(:each) do
+      before do
         configurator.reset!
       end
       it "loads the file specified in solr_config_path" do

data/spec/unit/file_path_builder_spec.rb

@@ -9,7 +9,7 @@ describe ActiveFedora::FilePathBuilder do
 
     context "when some datastreams exist" do
       before do
-        allow(parent).to receive(:attached_files).and_return('FOO56' => double)
+        allow(parent).to receive(:attached_files).and_return('FOO56' => instance_double(ActiveFedora::File))
       end
 
       it { should eq 'FOO57' }

data/spec/unit/file_spec.rb

@@ -110,7 +110,7 @@ describe ActiveFedora::File do
       context 'when content has changed from what is currently persisted' do
         context 'and has been set to something that has a #size method (i.e. string or File)' do
           it 'returns the size of the dirty content' do
-            dirty_content = double
+            dirty_content = instance_double(::File)
             allow(dirty_content).to receive(:size) { 8_675_309 }
             af_file.content = dirty_content
             expect(af_file.size).to eq dirty_content.size

data/spec/unit/files_hash_spec.rb

@@ -10,8 +10,8 @@ describe ActiveFedora::FilesHash do
 
   after { Object.send(:remove_const, :FilesContainer) }
 
-  let(:reflection) { double('reflection') }
-  let(:association) { double('association', reader: object) }
+  let(:reflection) { instance_double(ActiveFedora::Reflection::MacroReflection) }
+  let(:association) { instance_double(ActiveFedora::Associations::SingularAssociation, reader: object) }
   let(:object) { double('object') }
   let(:container) { FilesContainer.new }
 

data/spec/unit/finder_methods_spec.rb

@@ -57,9 +57,9 @@ describe ActiveFedora::FinderMethods do
   end
 
   describe "#search_in_batches" do
-    let(:docs) { double('docs', has_next?: false) }
+    let(:docs) { instance_double(RSolr::Response::PaginatedDocSet, has_next?: false) }
     let(:select_handler) { 'select' }
-    let(:connection) { double('conn') }
+    let(:connection) { instance_double(RSolr::Client) }
     before do
       expect(finder).to receive(:create_query).with('age_t' => '21').and_return('dummy query')
       allow(ActiveFedora::SolrService.instance).to receive(:conn).and_return(connection)
@@ -84,7 +84,7 @@ describe ActiveFedora::FinderMethods do
 
   describe '#search_by_id' do
     context 'with a document in solr' do
-      let(:doc) { double('Document') }
+      let(:doc) { instance_double(Hash) }
 
       before do
         expect(finder).to receive(:search_with_conditions).with({ id: 'x' }, hash_including(rows: 1)).and_return([doc])