active-fedora 6.7.8 → 6.8.0

data/spec/unit/rdf_node_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::RdfNode do
-  describe "inheritance" do
+  describe 'inheritance' do
     before do
       class Parent
         include ActiveFedora::RdfObject
@@ -22,14 +22,14 @@ describe ActiveFedora::RdfNode do
       Object.send(:remove_const, :Parent)
     end
 
-    describe "child class" do
-      it "should inherit the terms" do
-        Child.config.keys.should == ['title', 'description']
+    describe 'child class' do
+      it 'should inherit the terms' do
+        expect(Child.config.keys).to eq(['title', 'description'])
       end
     end
-    describe "parent class" do
-      it "should not be infected with the child terms" do
-        Parent.config.keys.should == ['title']
+    describe 'parent class' do
+      it 'should not be infected with the child terms' do
+        expect(Parent.config.keys).to eq(['title'])
       end
     end
   end

data/spec/unit/rdf_xml_writer_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require File.join( File.dirname(__FILE__), "../../lib/active_fedora/rdf_xml_writer" )
+require File.join( File.dirname(__FILE__), '../../lib/active_fedora/rdf_xml_writer' )
 
 describe ActiveFedora::RDFXMLWriter do
   before(:all) do
@@ -25,9 +25,9 @@ describe ActiveFedora::RDFXMLWriter do
     EOS
 
   end
-  it "should serialize graphs using the rdf:Description element despite the presence of rdf:type statements" do
+  it 'should serialize graphs using the rdf:Description element despite the presence of rdf:type statements' do
     graph = RDF::Graph.new
-    subject = RDF::URI.new "info:fedora/test:sample_pid"
+    subject = RDF::URI.new 'info:fedora/test:sample_pid'
     graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
     graph.insert RDF::Statement.new(subject, RDF::URI('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),  RDF::URI.new('http://purl.org/dc/dcmitype/Collection'))
     content = ActiveFedora::RDFXMLWriter.buffer do |writer|
@@ -35,17 +35,17 @@ describe ActiveFedora::RDFXMLWriter do
         writer << statement
       end
     end
-    content.should be_equivalent_to @rdf_xml_with_type
+    expect(content).to be_equivalent_to @rdf_xml_with_type
   end
-  
+
   it 'should serialize graphs without rdf:type equivalently to RDF::RDFXML::Writer' do
     graph = RDF::Graph.new
-    subject = RDF::URI.new "info:fedora/test:sample_pid"
+    subject = RDF::URI.new 'info:fedora/test:sample_pid'
     graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('info:fedora/demo:10'))
     graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_part_of),  RDF::URI.new('info:fedora/demo:11'))
     graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new('info:fedora/demo:12'))
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new('info:fedora/afmodel:OtherModel'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new('info:fedora/afmodel:SampleModel'))
 
     local_content = ActiveFedora::RDFXMLWriter.buffer do |writer|
       graph.each_statement do |statement|
@@ -57,7 +57,7 @@ describe ActiveFedora::RDFXMLWriter do
         writer << statement
       end
     end
-    EquivalentXml.equivalent?(local_content, @rdf_xml).should be_true
-    EquivalentXml.equivalent?(local_content, generic_content).should be_true
+    expect(EquivalentXml.equivalent?(local_content, @rdf_xml)).to be_truthy
+    expect(EquivalentXml.equivalent?(local_content, generic_content)).to be_truthy
   end
 end

data/spec/unit/rdfxml_rdf_datastream_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ActiveFedora::RdfxmlRDFDatastream do
-  describe "a new instance" do
+  describe 'a new instance' do
     before(:each) do
       class MyRdfxmlDatastream < ActiveFedora::RdfxmlRDFDatastream
         map_predicates do |map|
@@ -14,15 +14,15 @@ describe ActiveFedora::RdfxmlRDFDatastream do
     after(:each) do
       Object.send(:remove_const, :MyRdfxmlDatastream)
     end
-    it "should save and reload" do
+    it 'should save and reload' do
       @subject.publisher = ["St. Martin's Press"]
-      @subject.serialize.should =~ /<rdf:RDF/
+      expect(@subject.serialize).to match(/<rdf:RDF/)
     end
   end
 
-  describe "a complex data model" do
-    before do 
-      class DAMS < RDF::Vocabulary("http://library.ucsd.edu/ontology/dams#")
+  describe 'a complex data model' do
+    before do
+      class DAMS < RDF::Vocabulary('http://library.ucsd.edu/ontology/dams#')
         property :title
         property :relatedTitle
         property :type
@@ -46,7 +46,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
 
       module RDF
         # This enables RDF to respond_to? :value
-        def self.value 
+        def self.value
           self[:value]
         end
       end
@@ -61,7 +61,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
 
         attr_reader :about
 
-        def initialize(digital_object=nil, dsid=nil, options={})
+        def initialize(digital_object = nil, dsid = nil, options = {})
           @about = options.delete(:about)
           super
         end
@@ -79,7 +79,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
           include ActiveFedora::RdfObject
           map_predicates do |map|
             rdf_type DAMS.Description
-            map.value(:in=> RDF) do |index|
+            map.value(:in => RDF) do |index|
               index.as :searchable
             end
           end
@@ -92,35 +92,35 @@ describe ActiveFedora::RdfxmlRDFDatastream do
       Object.send(:remove_const, :DAMS)
     end
 
-    describe "a new instance" do
-      subject { MyDatastream.new(double('inner object', :pid=>'test:1', :new_record? =>true), 'descMetadata', about:"http://library.ucsd.edu/ark:/20775/") }
-      it "should have a subject" do
-        subject.rdf_subject.to_s.should == "http://library.ucsd.edu/ark:/20775/"
+    describe 'a new instance' do
+      subject { MyDatastream.new(double('inner object', :pid => 'test:1', :new_record? => true), 'descMetadata', about: 'http://library.ucsd.edu/ark:/20775/') }
+      it 'should have a subject' do
+        expect(subject.rdf_subject.to_s).to eq('http://library.ucsd.edu/ark:/20775/')
       end
-      
+
     end
 
-    describe "an instance with content" do
+    describe 'an instance with content' do
       subject do
-        subject = MyDatastream.new(double('inner object', :pid=>'test:1', :new_record? =>true), 'descMetadata')
+        subject = MyDatastream.new(double('inner object', :pid => 'test:1', :new_record? => true), 'descMetadata')
         subject.content = File.new('spec/fixtures/damsObjectModel.xml').read
         subject
       end
-      it "should have a subject" do
-        subject.rdf_subject.to_s.should == "http://library.ucsd.edu/ark:/20775/"
+      it 'should have a subject' do
+        expect(subject.rdf_subject.to_s).to eq('http://library.ucsd.edu/ark:/20775/')
       end
-      it "should have controlGroup" do
-        subject.controlGroup.should == 'X'
+      it 'should have controlGroup' do
+        expect(subject.controlGroup).to eq('X')
       end
-      it "should have mimeType" do
-        subject.mimeType.should == 'text/xml'
+      it 'should have mimeType' do
+        expect(subject.mimeType).to eq('text/xml')
       end
-      it "should have dsid" do
-        subject.dsid.should == 'descMetadata'
+      it 'should have dsid' do
+        expect(subject.dsid).to eq('descMetadata')
       end
-      it "should have fields" do
-        subject.resource_type.should == ["image"]
-        subject.title.first.value.should == ["example title"]
+      it 'should have fields' do
+        expect(subject.resource_type).to eq(['image'])
+        expect(subject.title.first.value).to eq(['example title'])
       end
     end
   end

data/spec/unit/relationship_graph_spec.rb

@@ -1,115 +1,115 @@
 require 'spec_helper'
 
 describe ActiveFedora::RelationshipGraph do
-  before do 
+  before do
     @graph = ActiveFedora::RelationshipGraph.new
     @n1 = ActiveFedora::Base.new()
     @n1.stub(:pid => 'foo:777')
   end
 
-  describe "#relationships" do
-    it "should have hash accessors" do
-      @graph.should respond_to(:[])
+  describe '#relationships' do
+    it 'should have hash accessors' do
+      expect(@graph).to respond_to(:[])
     end
 
-    it "should initialize new relation keys" do
-      @graph[:has_description].should be_empty
-      @graph[:has_description].should respond_to(:<<)
+    it 'should initialize new relation keys' do
+      expect(@graph[:has_description]).to be_empty
+      expect(@graph[:has_description]).to respond_to(:<<)
     end
 
   end
 
-  it "should add relationships" do
+  it 'should add relationships' do
     @n2 = ActiveFedora::Base.new
     @graph.add(:has_part, @n1)
-    @graph[:has_part].should == [@n1]
+    expect(@graph[:has_part]).to eq([@n1])
     @graph.add(:has_part, @n2)
-    @graph[:has_part].should == [@n1, @n2]
+    expect(@graph[:has_part]).to eq([@n1, @n2])
     @graph.add(:has_part, @n2)
-    @graph[:has_part].should == [@n1, @n2]
-    @graph.dirty.should be_true
+    expect(@graph[:has_part]).to eq([@n1, @n2])
+    expect(@graph.dirty).to be_truthy
   end
 
-  it "should create a rdf graph" do
+  it 'should create a rdf graph' do
     graph = @graph.to_graph('info:fedora/foo:1')
-    graph.should be_kind_of RDF::Graph
-    graph.statements.to_a.should == []
+    expect(graph).to be_kind_of RDF::Graph
+    expect(graph.statements.to_a).to eq([])
 
     @graph.add(:has_part, @n1)
     graph = @graph.to_graph('info:fedora/foo:1')
     stmts = graph.statements.to_a
-    stmts.size.should == 1
+    expect(stmts.size).to eq(1)
     stmt = stmts.first
-    stmt.subject.to_s.should == 'info:fedora/foo:1'
-    stmt.predicate.to_s.should == 'info:fedora/fedora-system:def/relations-external#hasPart'
-    stmt.object.to_s.should == 'info:fedora/foo:777'
-    
+    expect(stmt.subject.to_s).to eq('info:fedora/foo:1')
+    expect(stmt.predicate.to_s).to eq('info:fedora/fedora-system:def/relations-external#hasPart')
+    expect(stmt.object.to_s).to eq('info:fedora/foo:777')
+
   end
 
-  it "should have array accessor" do
+  it 'should have array accessor' do
     @graph.add(:has_part, @n1)
-    @graph[:has_part].should == [@n1]
+    expect(@graph[:has_part]).to eq([@n1])
   end
 
-  describe "has_predicate?" do
-    it "should return true when it has it" do
-      @graph.has_predicate?(:has_part).should be_false
+  describe 'has_predicate?' do
+    it 'should return true when it has it' do
+      expect(@graph.has_predicate?(:has_part)).to be_falsey
       @graph.add(:has_part, @n1)
-      @graph.has_predicate?(:has_part).should be_true
+      expect(@graph.has_predicate?(:has_part)).to be_truthy
     end
   end
 
-  describe "delete" do
-    it "should delete an object when an object is passed" do
+  describe 'delete' do
+    it 'should delete an object when an object is passed' do
       @graph.add(:has_part, @n1)
-      @graph[:has_part].should == [@n1]
+      expect(@graph[:has_part]).to eq([@n1])
       @graph.delete(:has_part, @n1)
-      @graph[:has_part].should == []
+      expect(@graph[:has_part]).to eq([])
     end
-    it "should delete an pid when an object is passed" do
+    it 'should delete an pid when an object is passed' do
       #a reloaded rels-ext is just a list of uris, not inflated.
       @graph.add(:has_part, 'info:fedora/foo:777')
-      @graph[:has_part].should == ['info:fedora/foo:777']
+      expect(@graph[:has_part]).to eq(['info:fedora/foo:777'])
       @graph.delete(:has_part, @n1)
-      @graph[:has_part].should == []
+      expect(@graph[:has_part]).to eq([])
     end
-    it "should delete an pid when a string is passed" do
+    it 'should delete an pid when a string is passed' do
       #a reloaded rels-ext is just a list of uris, not inflated.
       @graph.add(:has_part, 'info:fedora/foo:777')
-      @graph[:has_part].should == ['info:fedora/foo:777']
+      expect(@graph[:has_part]).to eq(['info:fedora/foo:777'])
       @graph.delete(:has_part, 'info:fedora/foo:777')
-      @graph[:has_part].should == []
+      expect(@graph[:has_part]).to eq([])
     end
-    it "should delete an object when a pid is passed" do
+    it 'should delete an object when a pid is passed' do
       #a reloaded rels-ext is just a list of uris, not inflated.
       @graph.add(:has_part, @n1)
-      @graph[:has_part].should == [@n1]
+      expect(@graph[:has_part]).to eq([@n1])
       @graph.delete(:has_part, 'info:fedora/foo:777')
-      @graph[:has_part].should == []
+      expect(@graph[:has_part]).to eq([])
     end
 
-    it "should delete all the predicates if only one arg is passed" do
+    it 'should delete all the predicates if only one arg is passed' do
       @graph.add(:has_part, @n1)
-      @graph[:has_part].should == [@n1]
+      expect(@graph[:has_part]).to eq([@n1])
       @graph.delete(:has_part)
-      @graph.has_predicate?(:has_part).should_not be_true
+      expect(@graph.has_predicate?(:has_part)).not_to be_truthy
     end
   end
-  describe "build_statement" do
-    it "should raise an error when the target is a pid, not a uri" do
-      lambda { @graph.build_statement('info:fedora/spec:9', :is_part_of, 'spec:7') }.should raise_error ArgumentError
+  describe 'build_statement' do
+    it 'should raise an error when the target is a pid, not a uri' do
+      expect { @graph.build_statement('info:fedora/spec:9', :is_part_of, 'spec:7') }.to raise_error ArgumentError
     end
-    it "should run the happy path" do
+    it 'should run the happy path' do
       stm = @graph.build_statement('info:fedora/spec:9', :is_part_of, 'info:fedora/spec:7')
-      stm.object.to_s.should == "info:fedora/spec:7"
+      expect(stm.object.to_s).to eq('info:fedora/spec:7')
     end
-    it "should also be happy with non-info URIs" do
+    it 'should also be happy with non-info URIs' do
       stm = @graph.build_statement('info:fedora/spec:9', :is_annotation_of, 'http://www.w3.org/standards/techs/rdf')
-      stm.object.to_s.should == "http://www.w3.org/standards/techs/rdf"
+      expect(stm.object.to_s).to eq('http://www.w3.org/standards/techs/rdf')
     end
-    it "should also be happy with targets that are URI::Generics" do
+    it 'should also be happy with targets that are URI::Generics' do
       stm = @graph.build_statement('info:fedora/spec:9', :is_annotation_of, URI.parse('http://www.w3.org/standards/techs/rdf'))
-      stm.object.to_s.should == "http://www.w3.org/standards/techs/rdf"
+      expect(stm.object.to_s).to eq('http://www.w3.org/standards/techs/rdf')
     end
   end
 end

data/spec/unit/rels_ext_datastream_spec.rb

@@ -2,57 +2,64 @@ require 'spec_helper'
 
 describe ActiveFedora::RelsExtDatastream do
   before(:all) do
-    @pid = "test:sample_pid"
-  
+    @pid = 'test:sample_pid'
+
     @sample_xml = Nokogiri::XML::Document.parse(@sample_xml_string)
   end
-  
+
   before(:each) do
       mock_inner = double('inner object')
       @mock_repo = double('repository')
-      @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{})
-      mock_inner.stub(:repository).and_return(@mock_repo)
-      mock_inner.stub(:pid).and_return(@pid)
-      @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, "RELS-EXT")
-      @test_ds.stub(:profile).and_return({})
+      @mock_repo.stub(:datastream_dissemination => 'My Content', :config => {})
+      allow(mock_inner).to receive(:repository).and_return(@mock_repo)
+      allow(mock_inner).to receive(:pid).and_return(@pid)
+      @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, 'RELS-EXT')
+      allow(@test_ds).to receive(:profile).and_return({})
   end
 
-  its(:metadata?) { should be_true}
-  its(:controlGroup) { should == "X"}
+  describe '#metadata?' do
+    subject { super().metadata? }
+    it { is_expected.to be_truthy}
+  end
+
+  describe '#controlGroup' do
+    subject { super().controlGroup }
+    it { is_expected.to eq('X')}
+  end
 
-  describe "#mimeType" do
+  describe '#mimeType' do
     it 'should use the application/rdf+xml mime type' do
-      @test_ds.mimeType.should == 'application/rdf+xml'
+      expect(@test_ds.mimeType).to eq('application/rdf+xml')
     end
   end
 
-  describe "#changed?" do
-    it "should be false when no changes have been made" do
-      subject.changed?.should == false
+  describe '#changed?' do
+    it 'should be false when no changes have been made' do
+      expect(subject.changed?).to eq(false)
     end
-    it "should be true when the model has changes" do
-      subject.model = double(:relationships_are_dirty=>true)
-      subject.changed?.should == true
+    it 'should be true when the model has changes' do
+      subject.model = double(:relationships_are_dirty => true)
+      expect(subject.changed?).to eq(true)
     end
   end
-  
-  
+
+
   describe '#serialize!' do
-    
-    it "should generate new rdf/xml as the datastream content if the object has been changed" do
+
+    it 'should generate new rdf/xml as the datastream content if the object has been changed' do
       graph = RDF::Graph.new
-      subject = RDF::URI.new "info:fedora/test:sample_pid"
+      subject = RDF::URI.new 'info:fedora/test:sample_pid'
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
-      
-      @test_ds.stub(:new? => true, :relationships_are_dirty? =>true, :relationships => graph, :model => double(:relationships_are_dirty= => true))
+
+      @test_ds.stub(:new? => true, :relationships_are_dirty? => true, :relationships => graph, :model => double(:relationships_are_dirty= => true))
       @test_ds.serialize!
-      EquivalentXml.equivalent?(@test_ds.content, "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n        <rdf:Description rdf:about='info:fedora/test:sample_pid'>\n        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/></rdf:Description>\n      </rdf:RDF>").should be_true
+      expect(EquivalentXml.equivalent?(@test_ds.content, "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n        <rdf:Description rdf:about='info:fedora/test:sample_pid'>\n        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/></rdf:Description>\n      </rdf:RDF>")).to be_truthy
     end
-  
+
   end
 
   describe '#to_rels_ext' do
-    
+
     before(:all) do
       @sample_rels_ext_xml = <<-EOS
       <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
@@ -65,69 +72,69 @@ describe ActiveFedora::RelsExtDatastream do
         </rdf:Description>
       </rdf:RDF>
       EOS
-      @pid = "test:sample_pid"
+      @pid = 'test:sample_pid'
     end
-    
+
     it 'should serialize the relationships array to Fedora RELS-EXT rdf/xml' do
       graph = RDF::Graph.new
-      subject = RDF::URI.new "info:fedora/test:sample_pid"
+      subject = RDF::URI.new 'info:fedora/test:sample_pid'
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('info:fedora/demo:10'))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_part_of),  RDF::URI.new('info:fedora/demo:11'))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new('info:fedora/demo:12'))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new('info:fedora/afmodel:OtherModel'))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new('info:fedora/afmodel:SampleModel'))
 
-      @test_ds.should_receive(:model).and_return(double("model", :relationships=>graph, :relationships_are_dirty= => true))
-      EquivalentXml.equivalent?(@test_ds.to_rels_ext(), @sample_rels_ext_xml).should be_true
+      expect(@test_ds).to receive(:model).and_return(double('model', :relationships => graph, :relationships_are_dirty= => true))
+      expect(EquivalentXml.equivalent?(@test_ds.to_rels_ext(), @sample_rels_ext_xml)).to be_truthy
     end
-    
+
     it 'should use mapped namespace prefixes when given' do
       graph = RDF::Graph.new
-      subject = RDF::URI.new "info:fedora/test:sample_pid"
+      subject = RDF::URI.new 'info:fedora/test:sample_pid'
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('info:fedora/demo:10'))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_part_of),  RDF::URI.new('info:fedora/demo:11'))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new('info:fedora/demo:12'))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new('info:fedora/afmodel:OtherModel'))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new('info:fedora/afmodel:SampleModel'))
 
-      @test_ds.stub(:model).and_return(double("model", :relationships=>graph, :relationships_are_dirty= => true))
+      allow(@test_ds).to receive(:model).and_return(double('model', :relationships => graph, :relationships_are_dirty= => true))
       rels = @test_ds.to_rels_ext()
-      EquivalentXml.equivalent?(rels, @sample_rels_ext_xml).should be_true
-      rels.should_not =~ /fedora:isMemberOf/
-      rels.should_not =~ /fedora-model:hasModel/
-      rels.should =~ /ns\d:isMemberOf/
-      rels.should =~ /ns\d:hasModel/
-      
-      ActiveFedora::Predicates.predicate_config[:predicate_namespaces] = {:"fedora-model"=>"info:fedora/fedora-system:def/model#", :fedora=>"info:fedora/fedora-system:def/relations-external#"}
+      expect(EquivalentXml.equivalent?(rels, @sample_rels_ext_xml)).to be_truthy
+      expect(rels).not_to match(/fedora:isMemberOf/)
+      expect(rels).not_to match(/fedora-model:hasModel/)
+      expect(rels).to match(/ns\d:isMemberOf/)
+      expect(rels).to match(/ns\d:hasModel/)
+
+      ActiveFedora::Predicates.predicate_config[:predicate_namespaces] = {:"fedora-model" => 'info:fedora/fedora-system:def/model#', :fedora => 'info:fedora/fedora-system:def/relations-external#'}
       rels = @test_ds.to_rels_ext()
-      EquivalentXml.equivalent?(rels, @sample_rels_ext_xml).should be_true
-      rels.should =~ /fedora:isMemberOf/
-      rels.should =~ /fedora-model:hasModel/
-      rels.should_not =~ /ns\d:isMemberOf/
-      rels.should_not =~ /ns\d:hasModel/
+      expect(EquivalentXml.equivalent?(rels, @sample_rels_ext_xml)).to be_truthy
+      expect(rels).to match(/fedora:isMemberOf/)
+      expect(rels).to match(/fedora-model:hasModel/)
+      expect(rels).not_to match(/ns\d:isMemberOf/)
+      expect(rels).not_to match(/ns\d:hasModel/)
       ActiveFedora::Predicates.predicate_config[:predicate_namespaces] = nil
     end
-    
+
   end
-  
-  describe "#from_xml" do
+
+  describe '#from_xml' do
     before(:all) do
       @test_obj = ActiveFedora::Base.new
-      @test_obj.add_relationship(:is_member_of, "info:fedora/demo:10")
-      @test_obj.add_relationship(:is_part_of, "info:fedora/demo:11")
-      @test_obj.add_relationship(:conforms_to, "AnInterface", true)
+      @test_obj.add_relationship(:is_member_of, 'info:fedora/demo:10')
+      @test_obj.add_relationship(:is_part_of, 'info:fedora/demo:11')
+      @test_obj.add_relationship(:conforms_to, 'AnInterface', true)
       @test_obj.save
     end
     after(:all) do
       @test_obj.delete
     end
-    it "should handle un-mapped predicates gracefully" do
-      @test_obj.add_relationship("foo", "info:fedora/foo:bar")
+    it 'should handle un-mapped predicates gracefully' do
+      @test_obj.add_relationship('foo', 'info:fedora/foo:bar')
       @test_obj.save
-      @test_obj.relationships.size.should == 5 
-      @test_obj.ids_for_outbound("foo").should == ["foo:bar"]
+      expect(@test_obj.relationships.size).to eq(5)
+      expect(@test_obj.ids_for_outbound('foo')).to eq(['foo:bar'])
     end
-    it "should automatically map un-mapped predicates" do
+    it 'should automatically map un-mapped predicates' do
       xml = <<-EOS
         <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
           <rdf:Description rdf:about='info:fedora/test:sample_pid'>
@@ -143,10 +150,10 @@ describe ActiveFedora::RelsExtDatastream do
       model = ActiveFedora::Base.new
       new_ds = ActiveFedora::RelsExtDatastream.new
       new_ds.model = model
-      lambda { ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds) }.should_not raise_exception
-      new_ds.to_rels_ext.should =~ /missing:hasOtherRelationship/
+      expect { ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds) }.not_to raise_exception
+      expect(new_ds.to_rels_ext).to match(/missing:hasOtherRelationship/)
     end
-    it "should handle un-mapped literals" do
+    it 'should handle un-mapped literals' do
       xml = "
                 <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"  xmlns:oai=\"http://www.openarchives.org/OAI/2.0/\">
                   <rdf:Description rdf:about=\"info:fedora/changeme:3489\">
@@ -161,9 +168,8 @@ describe ActiveFedora::RelsExtDatastream do
       new_ds.model = model
       ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds)
       new_ext = new_ds.to_rels_ext()
-      new_ext.should match "<ns0:itemID>oai:hull.ac.uk:hull:2708</ns0:itemID>"
-      
+      new_ext.should match "<ns2:itemID>oai:hull.ac.uk:hull:2708</ns2:itemID>"
     end
   end
-  
+
 end