active-fedora 5.1.0 → 5.2.0

data/spec/unit/nokogiri_datastream_spec.rb

@@ -15,12 +15,12 @@ describe ActiveFedora::NokogiriDatastream do
   before(:each) do
     @mock_inner = mock('inner object')
     @mock_repo = mock('repository')
-    @mock_repo.stubs(:datastream_dissemination=>'My Content', :config=>{})
-    @mock_inner.stubs(:repository).returns(@mock_repo)
-    @mock_inner.stubs(:pid)
-    @mock_inner.stubs(:new? => false)
+    @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{})
+    @mock_inner.stub(:repository).and_return(@mock_repo)
+    @mock_inner.stub(:pid)
+    @mock_inner.stub(:new? => false)
     @test_ds = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
-    @test_ds.stubs(:new? => false, :profile => {}, :datastream_content => '<test_xml/>')
+    @test_ds.stub(:new? => false, :profile => {}, :datastream_content => '<test_xml/>')
     @test_ds.content="<test_xml/>"
   end
   
@@ -44,7 +44,7 @@ describe ActiveFedora::NokogiriDatastream do
       test_ds1.ng_xml.to_xml.should == "<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n"
     end
     it "should initialize from #xml_template if no xml is provided" do
-      ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("<fake template/>")
+      ActiveFedora::NokogiriDatastream.should_receive(:xml_template).and_return("<fake template/>")
       n = ActiveFedora::NokogiriDatastream.new
       n.ng_xml.should be_equivalent_to("<fake template/>")
     end
@@ -86,7 +86,7 @@ describe ActiveFedora::NokogiriDatastream do
     end
     it "should do nothing if field key is a string (must be an array or symbol).  Will not accept xpath queries!" do
       xml_before = @mods_ds.to_xml
-      logger.expects(:warn).with "WARNING: descMetadata ignoring {\"fubar\" => \"the role\"} because \"fubar\" is a String (only valid OM Term Pointers will be used).  Make sure your html has the correct field_selector tags in it."
+      logger.should_receive(:warn).with "WARNING: descMetadata ignoring {\"fubar\" => \"the role\"} because \"fubar\" is a String (only valid OM Term Pointers will be used).  Make sure your html has the correct field_selector tags in it."
       @mods_ds.update_indexed_attributes( { "fubar"=>"the role" } ).should == {}
       @mods_ds.to_xml.should == xml_before
     end
@@ -149,12 +149,12 @@ describe ActiveFedora::NokogiriDatastream do
     end
     
     it "should call lookup with field_name and return the text values from each resulting node" do
-      @mods_ds.expects(:term_values).with("--my xpath--").returns(["value1", "value2"])
+      @mods_ds.should_receive(:term_values).with("--my xpath--").and_return(["value1", "value2"])
       @mods_ds.get_values("--my xpath--").should == ["value1", "value2"]
     end
     it "should assume that field_names that are strings are xpath queries" do
-      ActiveFedora::NokogiriDatastream.expects(:accessor_xpath).never
-      @mods_ds.expects(:term_values).with("--my xpath--").returns(["abstract1", "abstract2"])
+      ActiveFedora::NokogiriDatastream.should_receive(:accessor_xpath).never
+      @mods_ds.should_receive(:term_values).with("--my xpath--").and_return(["abstract1", "abstract2"])
       @mods_ds.get_values("--my xpath--").should == ["abstract1", "abstract2"]
     end
   end
@@ -164,7 +164,6 @@ describe ActiveFedora::NokogiriDatastream do
       mods_xml = Nokogiri::XML::Document.parse( fixture(File.join("mods_articles", "hydrangea_article1.xml")) )
       tmpl = Hydra::ModsArticleDatastream.new
       Hydra::ModsArticleDatastream.from_xml(mods_xml,tmpl).ng_xml.root.to_xml.should == mods_xml.root.to_xml
-      tmpl.should_not be_changed
     end
   end
   
@@ -178,9 +177,9 @@ describe ActiveFedora::NokogiriDatastream do
       @test_ds.should respond_to(:save)
     end
     it "should persist the product of .to_xml in fedora" do
-      @test_ds.expects(:new?).returns(true).at_least_once
-      @test_ds.stubs(:to_xml => "fake xml")
-      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'X', :dsState => 'A', :mimeType=>'text/xml')
+      @test_ds.stub(:new? => true)
+      @test_ds.stub(:to_xml => "fake xml")
+      @mock_repo.should_receive(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'X', :dsState => 'A', :mimeType=>'text/xml')
 
       @test_ds.serialize!
       @test_ds.save
@@ -191,19 +190,19 @@ describe ActiveFedora::NokogiriDatastream do
   describe '.content=' do
     subject { ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata") }
     it "should update the content" do
-      subject.stubs(:new? => false )
+      subject.stub(:new? => false )
       subject.content = "<a />"
       subject.datastream_content.should == '<a />'
     end
 
     it "should mark the object as changed" do
-      subject.stubs(:new? => false )
+      subject.stub(:new? => false )
       subject.content = "<a />"
       subject.should be_changed
     end
 
     it "update ngxml and mark the xml as loaded" do
-      subject.stubs(:new? => false )
+      subject.stub(:new? => false )
       subject.content = "<a />"
       subject.ng_xml.to_xml.should =~ /<a\/>/
       subject.xml_loaded.should be_true
@@ -240,13 +239,13 @@ describe ActiveFedora::NokogiriDatastream do
     end
     
     it "should ng_xml.to_xml" do
-      @test_ds.expects(:ng_xml).returns(Nokogiri::XML::Document.parse("<text_document/>")).twice
+      @test_ds.stub(:ng_xml => Nokogiri::XML::Document.parse("<text_document/>"))
       @test_ds.to_xml.should == "<text_document/>\n"       
     end
     
     it 'should accept an optional Nokogiri::XML Document as an argument and insert its fields into that (mocked test)' do
       doc = Nokogiri::XML::Document.parse("<test_document/>")
-      doc.root.expects(:add_child)#.with(@test_ds.ng_xml.root)
+      doc.root.should_receive(:add_child)#.with(@test_ds.ng_xml.root)
       @test_ds.to_xml(doc)
     end
     
@@ -286,10 +285,10 @@ describe ActiveFedora::NokogiriDatastream do
  
     it "should return correct values from solr_doc given different term pointers" do
       mock_term = mock("OM::XML::Term")
-      mock_term.stubs(:type).returns(:text)
+      mock_term.stub(:type).and_return(:text)
       mock_terminology = mock("OM::XML::Terminology")
-      mock_terminology.stubs(:retrieve_term).returns(mock_term)
-      ActiveFedora::NokogiriDatastream.stubs(:terminology).returns(mock_terminology)
+      mock_terminology.stub(:retrieve_term).and_return(mock_term)
+      ActiveFedora::NokogiriDatastream.stub(:terminology).and_return(mock_terminology)
       @mods_ds.from_solr(@solr_doc)
       term_pointer = [:name,:role,:roleTerm]
       @mods_ds.get_values_from_solr(:name,:role,:roleTerm).should == ["creator","submitter","teacher"]
@@ -348,7 +347,7 @@ describe ActiveFedora::NokogiriDatastream do
     end
 
     it "should update a value internally call OM::XML::TermValueOperators::update_values if internal_solr_doc is not set" do
-      @mods_ds.stubs(:om_update_values).once()
+      @mods_ds.stub(:om_update_values).once()
       term_pointer = [:name,:role,:roleTerm]
       @mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
     end
@@ -369,7 +368,7 @@ describe ActiveFedora::NokogiriDatastream do
     end
 
     it "should call OM::XML::term_values if internal_solr_doc is not set and return values from xml" do
-      @mods_ds.stubs(:om_term_values).once()
+      @mods_ds.stub(:om_term_values).once()
       term_pointer = [:name,:role,:roleTerm]
       @mods_ds.term_values(*term_pointer)
     end
@@ -378,7 +377,7 @@ describe ActiveFedora::NokogiriDatastream do
     it "should call get_values_from_solr if internal_solr_doc is set" do
       @mods_ds.from_solr(@solr_doc)
       term_pointer = [:name,:role,:roleTerm]
-      @mods_ds.stubs(:get_values_from_solr).once()
+      @mods_ds.stub(:get_values_from_solr).once()
       @mods_ds.term_values(*term_pointer)
     end
   end

data/spec/unit/ntriples_datastream_spec.rb

@@ -103,8 +103,8 @@ describe ActiveFedora::NtriplesRDFDatastream do
         end
       end
       @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
-      @subject.stubs(:pid => 'test:1')
-      @subject.stubs(:new? => false)
+      @subject.stub(:pid => 'test:1')
+      @subject.stub(:new? => false)
       @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
     end
 
@@ -126,7 +126,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
         end
       end
       @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
-      @subject.stubs(:pid => 'test:1', :repository => ActiveFedora::Base.connection_for_pid(0))
+      @subject.stub(:pid => 'test:1', :repository => ActiveFedora::Base.connection_for_pid(0))
     end
     after(:each) do
       Object.send(:remove_const, :MyDatastream)
@@ -166,10 +166,12 @@ describe ActiveFedora::NtriplesRDFDatastream do
           map.rights(:in => RDF::DC)
         end
       end
+    end
+    before(:each) do
       @subject = MyDatastream.new(@inner_object, 'solr_rdf')
       @subject.content = File.new('spec/fixtures/solr_rdf_descMetadata.nt').read
-      @subject.stubs(:pid => 'test:1')
-      @subject.stubs(:new? => false)
+      @subject.stub(:pid => 'test:1')
+      @subject.stub(:new? => false)
       @sample_fields = {:my_datastream__publisher => {:values => ["publisher1"], :type => :string, :behaviors => [:facetable, :sortable, :searchable, :displayable]}, 
         :my_datastream__based_near => {:values => ["coverage1", "coverage2"], :type => :text, :behaviors => [:displayable, :facetable, :searchable]}, 
         :my_datastream__created => {:values => "fake-date", :type => :date, :behaviors => [:sortable, :displayable]},
@@ -195,7 +197,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.to_solr(doc).should == doc
     end
     it "should iterate through @fields hash" do
-      @subject.expects(:fields).returns(@sample_fields)
+      @subject.should_receive(:fields).and_return(@sample_fields)
       solr_doc = @subject.to_solr
       solr_doc["my_datastream__publisher_t"].should == ["publisher1"]
       solr_doc["my_datastream__publisher_sort"].should == ["publisher1"]
@@ -213,7 +215,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
       solr_doc["my_datastream__empty_field_t"].should be_nil
     end
     it 'should append create keys in format field_name + _ + field_type' do
-      @subject.stubs(:fields).returns(@sample_fields)
+      @subject.stub(:fields).and_return(@sample_fields)
       
       #should have these            
       @subject.to_solr["my_datastream__publisher_t"].should_not be_nil
@@ -228,7 +230,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
     it "should use Solr mappings to generate field names" do
       ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
-      @subject.stubs(:fields).returns(@sample_fields)
+      @subject.stub(:fields).and_return(@sample_fields)
       solr_doc =  @subject.to_solr
 
       #should have these            
@@ -257,9 +259,10 @@ describe ActiveFedora::NtriplesRDFDatastream do
           delegate :rights, :to => :descMetadata
         end
         @obj = MyDatastream.new(@inner_object, 'solr_rdf')
-          @obj.stubs(:repository => mock(), :pid => 'test:1')
-          @obj.repository.stubs(:modify_datastream)
-          @obj.repository.stubs(:add_datastream)
+        repository = mock()
+          @obj.stub(:repository => repository, :pid => 'test:1')
+          repository.stub(:modify_datastream)
+          repository.stub(:add_datastream)
         @obj.created = "2012-03-04"
         @obj.title = "Of Mice and Men, The Sequel"
         @obj.publisher = "Bob's Blogtastic Publishing"
@@ -268,26 +271,14 @@ describe ActiveFedora::NtriplesRDFDatastream do
         @obj.rights = "Totally open, y'all"
         @obj.save
       end
-      describe '#save' do
-        it "should set dirty? to false" do
-          @obj.should_not be_changed
-          @obj.title = "something"
-          @obj.should be_changed
-          @obj.save
-          @obj.should_not be_changed
-        end
-      end
+
       describe '.content=' do
         it "should update the content and graph, marking the datastream as changed" do
-          mock_repo = mock('repository')
           sample_rdf = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
-          @obj.stubs(:pid).returns('test:123')
-          @obj.stubs(:repository).returns(mock_repo)
+          @obj.stub(:new? => false)
           @obj.should_not be_changed
-          @obj.content.should_not be_equivalent_to(sample_rdf)
           @obj.content = sample_rdf
           @obj.should be_changed
-          @obj.content.should be_equivalent_to(sample_rdf)
         end
       end
       it "should save content properly upon save" do
@@ -323,11 +314,11 @@ describe ActiveFedora::NtriplesRDFDatastream do
         end
         it "should solrize even when the object is not new" do
           foo = Foo.new
-          foo.expects(:update_index).once
+          foo.should_receive(:update_index).once
           foo.title = "title1"
           foo.save
           foo = Foo.find(foo.pid)
-          foo.expects(:update_index).once
+          foo.should_receive(:update_index).once
           foo.publisher = "Allah2"
           foo.title = "The Work2"
           foo.save  

data/spec/unit/property_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'
-require 'mocha'
-include Mocha::API
 
 describe ActiveFedora::Property do
   

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -60,7 +60,6 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ds)
     n.spatial.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
     n.title.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
-    n.should_not be_changed
   end
 
 
@@ -94,7 +93,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   
   describe '.to_xml' do
     it 'should output the fields hash as Qualified Dublin Core XML' do
-      #@test_ds.expects(:new?).returns(true).twice
+      #@test_ds.should_receive(:new?).and_return(true).twice
       sample_xml = "<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><dcterms:title>title1</dcterms:title><dcterms:publisher>publisher1</dcterms:publisher><dcterms:creator>creator1</dcterms:creator><dcterms:creator>creator2</dcterms:creator></dc>"
       @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, 'qdc' )
 

data/spec/unit/rdfxml_rdf_datastream_spec.rb

@@ -10,7 +10,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
         end
       end
       @subject = MyRdfxmlDatastream.new(@inner_object, 'mixed_rdf')
-      @subject.stubs(:pid => 'test:1')
+      @subject.stub(:pid => 'test:1')
     end
     after(:each) do
       Object.send(:remove_const, :MyRdfxmlDatastream)

data/spec/unit/relationship_graph_spec.rb

@@ -4,7 +4,7 @@ describe ActiveFedora::RelationshipGraph do
   before do 
     @graph = ActiveFedora::RelationshipGraph.new
     @n1 = ActiveFedora::Base.new()
-    @n1.stubs(:pid => 'foo:777')
+    @n1.stub(:pid => 'foo:777')
   end
 
   describe "#relationships" do

data/spec/unit/relationships_spec.rb

@@ -3,6 +3,18 @@ require 'spec_helper'
 @@last_pid = 0
 
 describe ActiveFedora::Relationships do
+    before(:all) do
+      @behavior = ActiveFedora::Relationships.deprecation_behavior
+      @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
+      ActiveFedora::Relationships.deprecation_behavior = :silence
+      ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
+    end
+  
+    after :all do
+      ActiveFedora::Relationships.deprecation_behavior = @behavior
+      ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
+    end
+
     def increment_pid
       @@last_pid += 1    
     end
@@ -74,12 +86,12 @@ describe ActiveFedora::Relationships do
       end
       
       it 'should create inbound relationship finders' do
-        SpecNode.expects(:create_inbound_relationship_finders)
+        SpecNode.should_receive(:create_inbound_relationship_finders)
         SpecNode.has_relationship("parts", :is_part_of, :inbound => true) 
       end
       
       it 'should create outbound relationship finders' do
-        SpecNode.expects(:create_outbound_relationship_finders).times(2)
+        SpecNode.should_receive(:create_outbound_relationship_finders).exactly(2).times
         SpecNode.has_relationship("parts", :is_part_of, :inbound => false)
         SpecNode.has_relationship("container", :is_member_of)
       end
@@ -90,7 +102,7 @@ describe ActiveFedora::Relationships do
         #local_node.internal_uri = "info:fedora/#{@pid}"
         local_node.pid = @pid
         
-        local_node.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
+        local_node.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
         local_node.add_relationship(:is_member_of, "info:fedora/container:A")
         local_node.add_relationship(:is_member_of, "info:fedora/container:B")
 
@@ -121,8 +133,8 @@ describe ActiveFedora::Relationships do
         it 'should create relationship descriptions both inbound and outbound' do
           @test_object2 = MockHasRelationship.new
           @test_object2.pid = increment_pid
-          @test_object2.stubs(:testing_inbound).returns({})
-          @test_object2.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content =>'')).at_least_once
+          @test_object2.stub(:testing_inbound).and_return({})
+          @test_object2.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content =>''))
           @test_object2.add_relationship(:has_model, SpecNode.to_class_uri)
           @test_object2.should respond_to(:testing_append)
           @test_object2.should respond_to(:testing_remove)
@@ -173,9 +185,9 @@ describe ActiveFedora::Relationships do
                               {"id"=>"_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
         SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
         local_node = SpecNode.new()
-        local_node.expects(:pid).returns("test:sample_pid")
-        SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once()
-        ActiveFedora::SolrService.expects(:query).with(@part_of_sample, :rows=>25).returns(@sample_solr_hits)
+        local_node.should_receive(:pid).and_return("test:sample_pid")
+        SpecNode.stub(:relationships_desc).and_return({:inbound=>{"parts"=>{:predicate=>:is_part_of}}})
+        ActiveFedora::SolrService.should_receive(:query).with(@part_of_sample, :rows=>25).and_return(@sample_solr_hits)
         local_node.parts_ids.should == ["_PID1_", "_PID2_", "_PID3_"]
       end
       
@@ -184,11 +196,11 @@ describe ActiveFedora::Relationships do
         SpecNode.create_inbound_relationship_finders("constituents", :is_constituent_of, :inbound => true)
         local_node = SpecNode.new
         mock_repo = mock("repo")
-        mock_repo.expects(:find).never
-        local_node.expects(:pid).returns("test:sample_pid")
-        SpecNode.expects(:relationships_desc).returns({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}}).at_least_once()
+        mock_repo.should_receive(:find).never
+        local_node.should_receive(:pid).and_return("test:sample_pid")
+        SpecNode.stub(:relationships_desc).and_return({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}})
         instance = stub(:conn=>stub(:conn))
-        ActiveFedora::SolrService.expects(:query).with(@constituent_of_sample, :raw=>true, :rows=>101).returns(solr_result)
+        ActiveFedora::SolrService.should_receive(:query).with(@constituent_of_sample, :raw=>true, :rows=>101).and_return(solr_result)
         local_node.constituents(:response_format => :solr, :rows=>101).should == solr_result
       end
       
@@ -196,23 +208,23 @@ describe ActiveFedora::Relationships do
       it "resulting _ids finder should search against solr and return an array of fedora PIDs" do
         SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
         local_node = SpecNode.new
-        local_node.expects(:pid).returns("test:sample_pid")
-        SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once() 
-        ActiveFedora::SolrService.expects(:query).with(@part_of_sample, :rows=>25).returns([Hash["id"=>"pid1"], Hash["id"=>"pid2"]])
+        local_node.should_receive(:pid).and_return("test:sample_pid")
+        SpecNode.stub(:relationships_desc).and_return({:inbound=>{"parts"=>{:predicate=>:is_part_of}}})
+        ActiveFedora::SolrService.should_receive(:query).with(@part_of_sample, :rows=>25).and_return([Hash["id"=>"pid1"], Hash["id"=>"pid2"]])
         local_node.parts(:response_format => :id_array).should == ["pid1", "pid2"]
       end
       
       it "resulting _ids finder should call the basic finder with :result_format => :id_array" do
         SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
         local_node = SpecNode.new
-        local_node.expects(:parts).with(:response_format => :id_array)
+        local_node.should_receive(:parts).with(:response_format => :id_array)
         local_node.parts_ids
       end
 
       it "resulting _query finder should call relationship_query" do
         SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
         local_node = SpecNode.new
-        local_node.expects(:relationship_query).with("parts")
+        local_node.should_receive(:relationship_query).with("parts")
         local_node.parts_query
       end
     end
@@ -240,15 +252,15 @@ describe ActiveFedora::Relationships do
         it "should read from relationships array and use Repository.find to build an array of objects" do
           SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
           local_node = SpecNode.new
-          local_node.expects(:ids_for_outbound).with(:is_member_of).returns(["my:_PID1_", "my:_PID2_", "my:_PID3_"])
+          local_node.should_receive(:ids_for_outbound).with(:is_member_of).and_return(["my:_PID1_", "my:_PID2_", "my:_PID3_"])
 
-          #ActiveFedora::ContentModel.expects(:known_models_for).returns([SpecNode]).times(3)
-          ActiveFedora::SolrService.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns([{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
+          #ActiveFedora::ContentModel.should_receive(:known_models_for).and_return([SpecNode]).times(3)
+          ActiveFedora::SolrService.should_receive(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").and_return([{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
                          {"id"=> "my:_PID2_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}, 
                          {"id"=> "my:_PID3_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}])
-          ActiveFedora::DigitalObject.expects(:find).with(SpecNode, 'my:_PID1_').returns(stub("inner obj", :'new?'=>false, :pid=>'my:_PID1_'))
-          ActiveFedora::DigitalObject.expects(:find).with(SpecNode, 'my:_PID2_').returns(stub("inner obj", :'new?'=>false, :pid=>'my:_PID2_'))
-          ActiveFedora::DigitalObject.expects(:find).with(SpecNode, 'my:_PID3_').returns(stub("inner obj", :'new?'=>false, :pid=>'my:_PID3_'))
+          ActiveFedora::DigitalObject.should_receive(:find).with(SpecNode, 'my:_PID1_').and_return(stub("inner obj", :'new?'=>false, :pid=>'my:_PID1_'))
+          ActiveFedora::DigitalObject.should_receive(:find).with(SpecNode, 'my:_PID2_').and_return(stub("inner obj", :'new?'=>false, :pid=>'my:_PID2_'))
+          ActiveFedora::DigitalObject.should_receive(:find).with(SpecNode, 'my:_PID3_').and_return(stub("inner obj", :'new?'=>false, :pid=>'my:_PID3_'))
           local_node.containers.map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"]
         end
       
@@ -257,23 +269,23 @@ describe ActiveFedora::Relationships do
           SpecNode.create_outbound_relationship_finders("constituents", :is_constituent_of)
           local_node = SpecNode.new
           mock_repo = mock("repo")
-          mock_repo.expects(:find).never
-          local_node.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
-          ActiveFedora::SolrService.expects(:query).returns(solr_result)
+          mock_repo.should_receive(:find).never
+          local_node.should_receive(:rels_ext).and_return(stub('rels-ext', :content=>''))
+          ActiveFedora::SolrService.should_receive(:query).and_return(solr_result)
           local_node.constituents(:response_format => :solr).should == solr_result
         end
         
         it "(:response_format => :id_array) should read from relationships array" do
           SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
           local_node = SpecNode.new
-          local_node.expects(:ids_for_outbound).with(:is_member_of).returns([])
+          local_node.should_receive(:ids_for_outbound).with(:is_member_of).and_return([])
           local_node.containers_ids
         end
       
         it "(:response_format => :id_array) should return an array of fedora PIDs" do
           SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
           local_node = SpecNode.new
-          local_node.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
+          local_node.stub(:rels_ext => mock("rels_ext", :content_will_change! => true, :content=>''))
           local_node.add_relationship(:is_member_of, "demo:10")
           result = local_node.containers_ids
           result.should be_instance_of(Array)
@@ -286,7 +298,7 @@ describe ActiveFedora::Relationships do
         it "should call the basic finder with :result_format => :id_array" do
           SpecNode.create_outbound_relationship_finders("parts", :is_part_of)
           local_node = SpecNode.new
-          local_node.expects(:parts).with(:response_format => :id_array)
+          local_node.should_receive(:parts).with(:response_format => :id_array)
           local_node.parts_ids
         end
       end
@@ -294,7 +306,7 @@ describe ActiveFedora::Relationships do
       it "resulting _query finder should call relationship_query" do
         SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
         local_node = SpecNode.new
-        local_node.expects(:relationship_query).with("containers")
+        local_node.should_receive(:relationship_query).with("containers")
         local_node.containers_query
       end
     end
@@ -312,21 +324,21 @@ describe ActiveFedora::Relationships do
         @local_node.should respond_to(:all_parts_outbound)
       end
       it "should rely on inbound & outbound finders" do      
-        @local_node.expects(:all_parts_inbound).with(:rows => 25).returns(["foo1"])
-        @local_node.expects(:all_parts_outbound).with(:rows => 25).returns(["foo2"])
+        @local_node.should_receive(:all_parts_inbound).with(:rows => 25).and_return(["foo1"])
+        @local_node.should_receive(:all_parts_outbound).with(:rows => 25).and_return(["foo2"])
         @local_node.all_parts.should == ["foo1", "foo2"]
       end
       it "(:response_format => :id_array) should rely on inbound & outbound finders" do
-        @local_node.expects(:all_parts_inbound).with(:response_format=>:id_array, :rows => 34).returns(["fooA"])
-        @local_node.expects(:all_parts_outbound).with(:response_format=>:id_array, :rows => 34).returns(["fooB"])
+        @local_node.should_receive(:all_parts_inbound).with(:response_format=>:id_array, :rows => 34).and_return(["fooA"])
+        @local_node.should_receive(:all_parts_outbound).with(:response_format=>:id_array, :rows => 34).and_return(["fooB"])
         @local_node.all_parts(:response_format=>:id_array, :rows => 34).should == ["fooA", "fooB"]
       end
       it "(:response_format => :solr) should construct a solr query that combines inbound and outbound searches" do
         # get the id array for outbound relationships then construct solr query by combining id array with inbound relationship search
-        @local_node.expects(:ids_for_outbound).with(:has_part).returns(["mypid:1"])
+        @local_node.should_receive(:ids_for_outbound).with(:has_part).and_return(["mypid:1"])
         id_array_query = ActiveFedora::SolrService.construct_query_for_pids(["mypid:1"])
         solr_result = mock("solr result")
-        ActiveFedora::SolrService.expects(:query).with("#{id_array_query} OR (#{@part_of_sample})", :rows=>25).returns(solr_result)
+        ActiveFedora::SolrService.should_receive(:query).with("#{id_array_query} OR (#{@part_of_sample})", :rows=>25).and_return(solr_result)
         @local_node.all_parts(:response_format=>:solr)
       end
 
@@ -345,14 +357,14 @@ describe ActiveFedora::Relationships do
       it "resulting _query finder should call relationship_query" do
         SpecNode.create_bidirectional_relationship_finders("containers", :is_member_of, :has_member)
         local_node = SpecNode.new
-        local_node.expects(:relationship_query).with("containers")
+        local_node.should_receive(:relationship_query).with("containers")
         local_node.containers_query
       end
     end
     
     describe "#has_bidirectional_relationship" do
       it "should ..." do
-        SpecNode.expects(:create_bidirectional_relationship_finders).with("all_parts", :has_part, :is_part_of, {})
+        SpecNode.should_receive(:create_bidirectional_relationship_finders).with("all_parts", :has_part, :is_part_of, {})
         SpecNode.has_bidirectional_relationship("all_parts", :has_part, :is_part_of)
       end
 
@@ -363,9 +375,9 @@ describe ActiveFedora::Relationships do
         @local_node2 = SpecNode.new
         @local_node2.pid = "mypid2"
         model_def = SpecNode.to_class_uri
-        @local_node.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
+        @local_node.stub(:rels_ext => mock("rels_ext", :content_will_change! => true, :content=>''))
         @local_node.add_relationship(:has_model, model_def)
-        @local_node2.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
+        @local_node2.stub(:rels_ext => mock("rels_ext", :content_will_change! => true, :content=>''))
         @local_node2.add_relationship(:has_model, model_def)
         @local_node.add_relationship(:has_part, @local_node2)
         @local_node2.add_relationship(:has_part, @local_node)
@@ -441,7 +453,7 @@ describe ActiveFedora::Relationships do
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(MockRelationshipNames.to_class_uri))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_member),  RDF::URI.new(@test_object4.internal_uri))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new(@test_object3.internal_uri))
-      @test_object2.expects(:relationships).returns(graph).at_least_once
+      @test_object2.stub(:relationships =>graph)
      @test_object2.find_relationship_by_name("testing").should == [@test_object3.internal_uri] 
     end
   end
@@ -470,22 +482,22 @@ describe ActiveFedora::Relationships do
     
     it "should call bidirectional_relationship_query if a bidirectional relationship" do
       ids = ["changeme:1","changeme:2","changeme:3","changeme:4"]
-      @mockrelsquery.expects(:ids_for_outbound).with(:has_part).returns(ids).at_least_once
-      @mockrelsquery.expects(:pid).returns("changeme:5")
-      MockNamedRelationshipQuery.expects(:bidirectional_relationship_query).with("changeme:5","testing_bi_query",ids)
+      @mockrelsquery.stub(:ids_for_outbound).with(:has_part).and_return(ids)
+      @mockrelsquery.should_receive(:pid).and_return("changeme:5")
+      MockNamedRelationshipQuery.should_receive(:bidirectional_relationship_query).with("changeme:5","testing_bi_query",ids)
       @mockrelsquery.relationship_query("testing_bi_query")
     end
     
     it "should call outbound_relationship_query if an outbound relationship" do
       ids = ["changeme:1","changeme:2","changeme:3","changeme:4"]
-      @mockrelsquery.expects(:ids_for_outbound).with(:is_part_of).returns(ids).at_least_once
-      MockNamedRelationshipQuery.expects(:outbound_relationship_query).with("testing_outbound_no_solr_fq",ids)
+      @mockrelsquery.stub(:ids_for_outbound).with(:is_part_of).and_return(ids)
+      MockNamedRelationshipQuery.should_receive(:outbound_relationship_query).with("testing_outbound_no_solr_fq",ids)
       @mockrelsquery.relationship_query("testing_outbound_no_solr_fq")
     end
     
     it "should call inbound_relationship_query if an inbound relationship" do
-      @mockrelsquery.expects(:pid).returns("changeme:5")
-      MockNamedRelationshipQuery.expects(:inbound_relationship_query).with("changeme:5","testing_inbound_query")
+      @mockrelsquery.should_receive(:pid).and_return("changeme:5")
+      MockNamedRelationshipQuery.should_receive(:inbound_relationship_query).with("changeme:5","testing_inbound_query")
       @mockrelsquery.relationship_query("testing_inbound_query")
     end
   end
@@ -529,7 +541,7 @@ describe ActiveFedora::Relationships do
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(SpecNode.to_class_uri))
-      @test_object.expects(:relationships).returns(graph).at_least_once
+      @test_object.stub(:relationships).and_return(graph)
       @test_object.conforms_to?(SpecNode).should == true
     end
   end
@@ -549,7 +561,7 @@ describe ActiveFedora::Relationships do
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(SpecNode.to_class_uri))
-      @test_object.expects(:relationships).returns(graph).at_least_once
+      @test_object.stub(:relationships).and_return(graph)
       @test_object3.assert_conforms_to('object',@test_object,SpecNode)
     end
   end
@@ -595,14 +607,14 @@ describe ActiveFedora::Relationships do
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(model_pid))
-      @test_object2.expects(:relationships).returns(graph).at_least_once
+      @test_object2.stub(:relationships).and_return(graph)
       #should return expected named relationships
       @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[]}}
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(model_pid))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new(@test_object.internal_uri))
-      @test_object3.expects(:relationships).returns(graph).at_least_once
+      @test_object3.stub(:relationships).and_return(graph)
       @test_object3.relationships_by_name.should == {:self=>{"testing"=>[@test_object.internal_uri],"testing2"=>[]}}
     end 
   end