active-fedora 3.1.6 → 3.2.0.pre1

data/spec/unit/{base_named_datastream_spec.rb → datastream_collections_spec.rb}

@@ -1,45 +1,50 @@
 require 'spec_helper'
-require "active_fedora"
 
-# Some tentative extensions to ActiveFedora::Base
 
-describe ActiveFedora::Base do
-  
-  @@last_pid = 0
-
-  def increment_pid
-    @@last_pid += 1    
-  end
-  
-  before(:each) do
-    @test_object = ActiveFedora::Base.new
-  end
+DEPRECATION_MSG = "Deprecation: DatastreamCollections will not be included by default in the next version.   To use has_datastream add 'include ActiveFedora::DatastreamCollections' to your model"
 
-  after(:each) do
-    begin
-    @test_object.delete
-    rescue
-    end
-  
-    begin
-    @test_object2.delete
-    rescue
+describe ActiveFedora::DatastreamCollections do
+  describe '.has_datastream' do
+    before(:all) do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      
+      class MockHasDatastream < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
+        has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E'
+      end
     end
     
-    begin
-    @test_object3.delete
-    rescue
+    it 'should cache a definition of named datastream and create helper methods to add/remove/access them' do
+      @test_object2 = MockHasDatastream.new
+      #prefix should default to name in caps if not specified in has_datastream call
+      @test_object2.named_datastreams_desc.should == {"thumbnail"=>{:name=>"thumbnail",:prefix => "THUMB", 
+                                                                    :type=>"ActiveFedora::Datastream", :mimeType=>"image/jpeg", 
+                                                                    :controlGroup=>'M'},
+                                                      "EAD"=>       {:name=>"EAD", :prefix=>"EAD",
+                                                                    :type=>"ActiveFedora::Datastream", :mimeType=>"application/xml", 
+                                                                    :controlGroup=>'M' },
+                                                      "external"=>  {:name=>"external", :prefix=>"EXTERNAL",
+                                                                    :type=>"ActiveFedora::Datastream", :controlGroup=>'E' }}
+      @test_object2.should respond_to(:thumbnail_append)
+      @test_object2.should respond_to(:thumbnail_file_append)
+      @test_object2.should respond_to(:thumbnail)
+      @test_object2.should respond_to(:thumbnail_ids)
+      @test_object2.should respond_to(:ead_append)
+      @test_object2.should respond_to(:ead_file_append)
+      @test_object2.should respond_to(:EAD)
+      @test_object2.should respond_to(:EAD_ids)
+      @test_object2.should respond_to(:external)
+      @test_object2.should respond_to(:external_ids)
     end
   end
-  
-  it 'should provide #datastream_names' do
-    @test_object.should respond_to(:datastream_names)
-  end
-  
   describe '#datastream_names' do
-    class MockDatastreamNames < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
+    before(:all) do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockDatastreamNames < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
+      end
     end
     
     it 'should return an array of datastream names defined by has_datastream' do
@@ -48,19 +53,18 @@ describe ActiveFedora::Base do
     end
   end
   
-  it 'should provide #add_named_datastream' do
-    @test_object.should respond_to(:add_named_datastream)
-  end
-  
   describe '#add_named_datastream' do
-    class MockAddNamedDatastream < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
-      has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
-      has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E'
+    before(:all) do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockAddNamedDatastream < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
+        has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
+        has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E'
+      end
     end
-
     before do
+
       @test_object2 = MockAddNamedDatastream.new
       @f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
       @f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
@@ -140,15 +144,14 @@ describe ActiveFedora::Base do
     end
   end
   
-  it 'should provide #add_named_file_datastream' do
-    @test_object.should respond_to(:add_named_file_datastream)
-  end
-  
   describe '#add_named_file_datastream' do
-    class MockAddNamedFileDatastream < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
-      has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockAddNamedFileDatastream < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
+        has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
+      end
     end
     
     it 'should add a datastream as controlGroup M with blob set to file' do
@@ -170,14 +173,13 @@ describe ActiveFedora::Base do
       
     end
   end
-  
-  it 'should provide #update_named_datastream' do
-    @test_object.should respond_to(:update_named_datastream)
-  end
-  
+
   describe '#update_named_datastream' do
-    class MockUpdateNamedDatastream < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockUpdateNamedDatastream < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+      end
     end
     
     it 'should update a datastream and not increment the dsid' do
@@ -231,32 +233,29 @@ describe ActiveFedora::Base do
       @test_object2.thumbnail.first.content.should == f2.read
     end
   end
-  
-  describe '#create_datastream' do
-    it 'should create a datastream object using the type of object supplied in the string (does reflection)' do
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
-      f.stubs(:content_type).returns("image/jpeg")
-      f.stubs(:original_filename).returns("minivan.jpg")
-      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>f})
-      ds.class.should == ActiveFedora::Datastream
-      ds.dsLabel.should == "minivan.jpg"
-      ds.mimeType.should == "image/jpeg"
+  describe '#named_datastreams_desc' do
+      
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockNamedDatastreamsDesc < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+      end
     end
-    it 'should create a datastream object from a string' do
-      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>"My file data"})
-      ds.class.should == ActiveFedora::Datastream
-      ds.dsLabel.should == nil
-      ds.mimeType.should == "application/octet-stream"
+    
+    it 'should intialize a value to an empty hash and then not modify afterward' do
+      @test_object2 = MockNamedDatastreamsDesc.new
+      @test_object2.named_datastreams_desc.should == {"thumbnail"=>{:name=>"thumbnail",:prefix => "THUMB", 
+                                                                    :type=>"ActiveFedora::Datastream", :mimeType=>"image/jpeg", 
+                                                                    :controlGroup=>'M'}}
     end
   end
-  
-  it 'should provide #is_named_datastream?' do
-    @test_object.should respond_to(:is_named_datastream?)
-  end
-  
+
   describe '#is_named_datastream?' do
-    class MockIsNamedDatastream < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockIsNamedDatastream < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+      end
     end
     
     it 'should return true if a named datastream exists in model' do
@@ -266,15 +265,15 @@ describe ActiveFedora::Base do
     end
   end
   
-  it 'should provide #named_datastreams' do
-    @test_object.should respond_to(:named_datastreams)
-  end
   
   describe '#named_datastreams' do
-    class MockNamedDatastreams < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
-      has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockNamedDatastreams < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
+        has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+      end
     end
     
     it 'should return a hash of datastream names to arrays of datastreams' do
@@ -316,15 +315,15 @@ describe ActiveFedora::Base do
   end
   
   
-  it 'should provide #named_datastreams_ids' do
-    @test_object.should respond_to(:named_datastreams_ids)
-  end
-  
+    
   describe '#named_datastreams_ids' do
-    class MockNamedDatastreamsIds < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
-      has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockNamedDatastreamsIds < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
+        has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+      end
     end
     
     it 'should provide a hash of datastreams names to array of datastream ids' do
@@ -342,28 +341,14 @@ describe ActiveFedora::Base do
     end
   end
   
-  #
-  # Class level methods
-  #
-  describe '#named_datastreams_desc' do
-      
-    class MockNamedDatastreamsDesc < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-    end
-    
-    it 'should intialize a value to an empty hash and then not modify afterward' do
-      @test_object.named_datastreams_desc.should == {}
-      @test_object2 = MockNamedDatastreamsDesc.new
-      @test_object2.named_datastreams_desc.should == {"thumbnail"=>{:name=>"thumbnail",:prefix => "THUMB", 
-                                                                    :type=>"ActiveFedora::Datastream", :mimeType=>"image/jpeg", 
-                                                                    :controlGroup=>'M'}}
-    end
-  end
     
   describe '#create_named_datastream_finders' do
-    class MockCreateNamedDatastreamFinder < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockCreateNamedDatastreamFinder < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
+      end
     end
     
     it 'should create helper methods to get named datastreams or dsids' do
@@ -398,10 +383,13 @@ describe ActiveFedora::Base do
   end
     
   describe '#create_named_datastream_update_methods' do
-    class MockCreateNamedDatastreamUpdateMethods < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
-      has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+    before do
+      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
+      class MockCreateNamedDatastreamUpdateMethods < ActiveFedora::Base
+        has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
+        has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
+        has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+      end
     end
     
     it 'should create append method for each has_datastream entry' do
@@ -433,35 +421,4 @@ describe ActiveFedora::Base do
       t3_external1.controlGroup == 'E'
     end
   end
-    
-  describe '#has_datastream' do
-    class MockHasDatastream < ActiveFedora::Base
-      has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-      has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
-      has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E'
-    end
-    
-    it 'should cache a definition of named datastream and create helper methods to add/remove/access them' do
-      @test_object2 = MockHasDatastream.new
-      #prefix should default to name in caps if not specified in has_datastream call
-      @test_object2.named_datastreams_desc.should == {"thumbnail"=>{:name=>"thumbnail",:prefix => "THUMB", 
-                                                                    :type=>"ActiveFedora::Datastream", :mimeType=>"image/jpeg", 
-                                                                    :controlGroup=>'M'},
-                                                      "EAD"=>       {:name=>"EAD", :prefix=>"EAD",
-                                                                    :type=>"ActiveFedora::Datastream", :mimeType=>"application/xml", 
-                                                                    :controlGroup=>'M' },
-                                                      "external"=>  {:name=>"external", :prefix=>"EXTERNAL",
-                                                                    :type=>"ActiveFedora::Datastream", :controlGroup=>'E' }}
-      @test_object2.should respond_to(:thumbnail_append)
-      @test_object2.should respond_to(:thumbnail_file_append)
-      @test_object2.should respond_to(:thumbnail)
-      @test_object2.should respond_to(:thumbnail_ids)
-      @test_object2.should respond_to(:ead_append)
-      @test_object2.should respond_to(:ead_file_append)
-      @test_object2.should respond_to(:EAD)
-      @test_object2.should respond_to(:EAD_ids)
-      @test_object2.should respond_to(:external)
-      @test_object2.should respond_to(:external_ids)
-    end
-  end
 end

data/spec/unit/metadata_datastream_spec.rb

@@ -44,7 +44,6 @@ describe ActiveFedora::MetadataDatastream do
       @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'mdDs')
       @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'mdDs', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
       @test_ds.expects(:to_xml).returns("fake xml")
-      @test_ds.expects(:dirty?).returns(true)
       @test_ds.serialize!
       @test_ds.save
       @test_ds.mimeType.should == 'text/xml'

data/spec/unit/nokogiri_datastream_spec.rb

@@ -43,7 +43,6 @@ describe ActiveFedora::NokogiriDatastream do
     it "should initialize from #xml_template if no xml is provided" do
       ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("<fake template/>")
       n = ActiveFedora::NokogiriDatastream.new(nil, nil)
-      n.expects(:content).returns('')
       n.ensure_xml_loaded
       n.ng_xml.should be_equivalent_to("<fake template/>")
     end

data/spec/unit/predicates_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+
+describe ActiveFedora::Predicates do
+  it 'should provide .default_predicate_namespace' do
+    ActiveFedora::Predicates.default_predicate_namespace.should == 'info:fedora/fedora-system:def/relations-external#'
+  end
+ 
+  describe "#predicate_mappings" do 
+
+    it 'should return a hash' do
+      ActiveFedora::Predicates.predicate_mappings.should be_kind_of Hash
+    end
+
+    it "should provide mappings to the fedora ontology via the info:fedora/fedora-system:def/relations-external default namespace mapping" do
+      ActiveFedora::Predicates.predicate_mappings.keys.include?(ActiveFedora::Predicates.default_predicate_namespace).should be_true
+      ActiveFedora::Predicates.predicate_mappings[ActiveFedora::Predicates.default_predicate_namespace].should be_kind_of Hash
+    end
+
+    it 'should provide predicate mappings for entire Fedora Relationship Ontology' do
+      desired_mappings = Hash[:is_member_of => "isMemberOf",
+                            :has_member => "hasMember",
+                            :is_part_of => "isPartOf",
+                            :has_part => "hasPart",
+                            :is_member_of_collection => "isMemberOfCollection",
+                            :has_collection_member => "hasCollectionMember",
+                            :is_constituent_of => "isConstituentOf",
+                            :has_constituent => "hasConstituent",
+                            :is_subset_of => "isSubsetOf",
+                            :has_subset => "hasSubset",
+                            :is_derivation_of => "isDerivationOf",
+                            :has_derivation => "hasDerivation",
+                            :is_dependent_of => "isDependentOf",
+                            :has_dependent => "hasDependent",
+                            :is_description_of => "isDescriptionOf",
+                            :has_description => "hasDescription",
+                            :is_metadata_for => "isMetadataFor",
+                            :has_metadata => "hasMetadata",
+                            :is_annotation_of => "isAnnotationOf",
+                            :has_annotation => "hasAnnotation",
+                            :has_equivalent => "hasEquivalent",
+                            :conforms_to => "conformsTo",
+                            :has_model => "hasModel"]
+      desired_mappings.each_pair do |k,v|
+        ActiveFedora::Predicates.predicate_mappings[ActiveFedora::Predicates.default_predicate_namespace].should have_key(k)
+        ActiveFedora::Predicates.predicate_mappings[ActiveFedora::Predicates.default_predicate_namespace][k].should == v
+      end
+    end
+  end
+
+  it 'should provide #predicate_lookup that maps symbols to common RELS-EXT predicates' do
+    ActiveFedora::Predicates.should respond_to(:predicate_lookup)
+    ActiveFedora::Predicates.predicate_lookup(:is_part_of).should == "isPartOf"
+    ActiveFedora::Predicates.predicate_lookup(:is_member_of).should == "isMemberOf"
+    ActiveFedora::Predicates.predicate_lookup("isPartOfCollection").should == "isPartOfCollection"
+    ActiveFedora::Predicates.predicate_config[:predicate_mapping].merge!({"some_namespace"=>{:has_foo=>"hasFOO"}})
+    ActiveFedora::Predicates.find_predicate(:has_foo).should == ["hasFOO","some_namespace"]
+    ActiveFedora::Predicates.predicate_lookup(:has_foo,"some_namespace").should == "hasFOO"
+    lambda { ActiveFedora::Predicates.predicate_lookup(:has_foo) }.should raise_error ActiveFedora::UnregisteredPredicateError
+  end
+    
+    
+
+end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -24,9 +24,6 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
   it "from_xml should parse everything correctly" do
     #originally just tested that lcsh encoding and stuff worked, but the other stuff is worth testing
-    stub_get("meh:leh", ['RELS-EXT', 'sensitive_passages', 'significant_passages', 'dublin_core', 'properties'])
-    stub_get_content("meh:leh", ['dublin_core'])
-    ActiveFedora::RubydoraConnection.instance.expects(:nextid).returns("meh:leh")
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
 
     tmpl.expects(:subject_append).with('sh1')
@@ -69,7 +66,6 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   it "should have identity in and out" do
     sample = fixture('oh_qdc.xml')
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-    tmpl.expects(:content).returns('')
     x1 = Nokogiri::XML::Document.parse(sample).xpath('/wrapper/foxml:datastream/foxml:datastreamVersion/foxml:xmlContent/dc').first.to_xml
     z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(x1, tmpl)
     y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(z.to_dc_xml, tmpl)
@@ -78,7 +74,6 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
   it "should handle arbitrary attribs" do
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-    tmpl.expects(:content).returns('')
     tmpl.field :mycomplicated, :string, :xml_node=>'alt', :element_attrs=>{:foo=>'bar'}
     tmpl.mycomplicated_values='fubar'
     Nokogiri::XML(tmpl.to_dc_xml).should be_equivalent_to('<dc xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:dcterms=\'http://purl.org/dc/terms/\'><dcterms:alt foo=\'bar\'>fubar</dcterms:alt></dc>')
@@ -90,7 +85,6 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     doc = Nokogiri::XML::Document.parse(File.open( File.dirname(__FILE__)+'/../fixtures/changeme155.xml') )
     stream = doc.xpath('//foxml:datastream[@ID=\'dublin_core\']/foxml:datastreamVersion/foxml:xmlContent/dc')
     ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
-    ds.expects(:content).returns('')
     n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ds)
     n.spatial_values.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
     n.title_values.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
@@ -135,7 +129,6 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     it "should call .content= with to_dc_xml" do
       result = @test_ds.to_dc_xml
       @test_ds.expects(:content=).with(result)
-      @test_ds.expects(:dirty?).returns(true)
       @test_ds.serialize!
     end
   end