om 1.8.0 → 1.8.1

data/spec/unit/named_term_proxy_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe "OM::XML::NamedTermProxy" do
-  
+
   before(:all) do
-    
-    class NamedProxyTestDocument 
+
+    class NamedProxyTestDocument
       include OM::XML::Document
       set_terminology do |t|
         t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
@@ -17,39 +17,39 @@ describe "OM::XML::NamedTermProxy" do
         t.adoptive_parent(:ref=>[:parent], :attributes=>{:type=>"adoptive"})
         t.parentfoobarproxy(:proxy=>[:parent, :foo, :bar])
       end
-      def self.xml_template 
+      def self.xml_template
         '<mods xmlns="http://www.loc.gov/mods/v3"><parent><foo/></parent></mods>'
       end
     end
-    
+
     @test_terminology = NamedProxyTestDocument.terminology
-    @test_proxy = @test_terminology.retrieve_term(:parent, :my_proxy)
-    @proxied_term = @test_terminology.retrieve_term(:parent, :foo, :bar)
+    @test_proxy      = @test_terminology.retrieve_term(:parent, :my_proxy)
+    @proxied_term    = @test_terminology.retrieve_term(:parent, :foo, :bar)
     @adoptive_parent = @test_terminology.retrieve_term(:adoptive_parent)
 
   end
-    
+
   it "should proxy all extra methods to the proxied object" do
     [:xpath, :xpath_relative, :xml_builder_template].each do |method|
-      @proxied_term.expects(method)
+      expect(@proxied_term).to receive(method)
       @test_proxy.send(method)
     end
   end
   it "should proxy the term specified by the builder" do
-    @test_proxy.proxied_term.should == @test_terminology.retrieve_term(:parent, :foo, :bar)
-    @test_proxy.xpath.should == "//oxns:parent/oxns:foo/oxns:bar"
+    expect(@test_proxy.proxied_term).to eq(@test_terminology.retrieve_term(:parent, :foo, :bar))
+    expect(@test_proxy.xpath).to eq("//oxns:parent/oxns:foo/oxns:bar")
   end
   it "should search relative to the parent term when finding the term to proxy" do
-    proxy2 = @test_terminology.retrieve_term(:adoptive_parent, :my_proxy)    
-    proxy2.proxied_term.should == @test_terminology.retrieve_term(:adoptive_parent, :foo, :bar)
-    proxy2.xpath.should == '//oxns:parent[@type="adoptive"]/oxns:foo/oxns:bar'
+    proxy2 = @test_terminology.retrieve_term(:adoptive_parent, :my_proxy)
+    expect(proxy2.proxied_term).to eq(@test_terminology.retrieve_term(:adoptive_parent, :foo, :bar))
+    expect(proxy2.xpath).to eq('//oxns:parent[@type="adoptive"]/oxns:foo/oxns:bar')
   end
   it "should support NamedTermProxies that point to root terms" do
-    @test_terminology.xpath_for(:parentfoobarproxy).should == "//oxns:parent/oxns:foo/oxns:bar"
+    expect(@test_terminology.xpath_for(:parentfoobarproxy)).to eq("//oxns:parent/oxns:foo/oxns:bar")
   end
   it "should be usable in update_values" do
     document = NamedProxyTestDocument.from_xml(NamedProxyTestDocument.xml_template)
     document.update_values([:parentfoobarproxy] => "FOObar!")
-    document.term_values(:parentfoobarproxy).should == ["FOObar!"]
+    expect(document.term_values(:parentfoobarproxy)).to eq(["FOObar!"])
   end
 end

data/spec/unit/node_generator_spec.rb

@@ -1,26 +1,26 @@
 require 'spec_helper'
 
 describe "OM::XML::NodeGenerator" do
-  
-  
+
+
   before(:each) do
     @test_mods_term = OM::XML::Term.new(:mods)
     @test_volume_term = OM::XML::Term.new(:volume, :path=>"detail", :attributes=>{:type=>"volume"}, :default_content_path=>"number")
   end
-  
+
   describe '#generate' do
     it "should use the corresponding builder template(s) to generate the node" do
-      OM::XML::NodeGenerator.generate(@test_mods_term, "foo").root.to_xml.should == "<mods>foo</mods>"
+      expect(OM::XML::NodeGenerator.generate(@test_mods_term, "foo").root.to_xml).to eq("<mods>foo</mods>")
       generated_node = OM::XML::NodeGenerator.generate(@test_volume_term, "108", {:attributes=>{"extraAttr"=>"my value"}})
-      generated_node.xpath('./detail[@type="volume"][@extraAttr="my value"]').xpath("./number").text.should == "108"
+      expect(generated_node.xpath('./detail[@type="volume"][@extraAttr="my value"]').xpath("./number").text).to eq("108")
       # Would be great if we wrote a have_node custom rspec matcher...
       # generated_node.should have_node 'role[@authority="marcrelator"][@type="code"]' do
       #   with_node "roleTerm", "creator"
       # end
     end
     it "should return Nokogiri Documents" do
-      OM::XML::NodeGenerator.generate(@test_mods_term, "foo").class.should == Nokogiri::XML::Document
+      expect(OM::XML::NodeGenerator.generate(@test_mods_term, "foo").class).to eq(Nokogiri::XML::Document)
     end
   end
-  
+
 end

data/spec/unit/nokogiri_sanity_spec.rb

@@ -1,77 +1,77 @@
 require 'spec_helper'
 
 describe "OM::XML::TermValueOperators" do
-  
+
   describe "find_by_terms" do
     before(:each) do
       @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
     end
-  
+
     it "should do" do
-      @article.find_by_terms({:journal=>0}).length.should == 1
+      expect(@article.find_by_terms({:journal=>0}).length).to eq(1)
     end
   end
-  
+
   describe "update_values" do
     before(:each) do
       @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
     end
-  
+
     it "should respond with a hash of updated values and their indexes" do
-      test_args = {[{"person"=>"0"},"description"]=>{"-1"=>"mork", "1"=>"york"}}      
+      test_args = {[{"person"=>"0"},"description"]=>{"-1"=>"mork", "1"=>"york"}}
       result = @article.update_values(test_args)
-      result.should == {"person_0_description"=>{"0"=>"mork","1"=>"york"}}
+      expect(result).to eq({"person_0_description"=>{"0"=>"mork","1"=>"york"}})
     end
-    
+
     it "should update the xml in the specified datatsream and save those changes to Fedora" do
-      @article.term_values({:person=>0}, :first_name).should == ["GIVEN NAMES"]
+      expect(@article.term_values({:person=>0}, :first_name)).to eq(["GIVEN NAMES"])
       test_args = {[{:person=>0}, :first_name]=>{"0"=>"Replacement FirstName"}}
       @article.update_values(test_args)
-      @article.term_values({:person=>0}, :first_name).should == ["Replacement FirstName"]
-      @article.should be_changed
+      expect(@article.term_values({:person=>0}, :first_name)).to eq(["Replacement FirstName"])
+      expect(@article).to be_changed
     end
-    
+
     it "should update the xml according to the find_by_terms_and_values in the given hash" do
       terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
       result = @article.update_values(terms_update_hash)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
-      
+      expect(result).to eq({"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}})
+
       # Trying again with a more complex update hash
       terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
       result = @article.update_values(terms_update_hash)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
-      @article.should be_changed
+      expect(result).to eq({"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}})
+      expect(@article).to be_changed
     end
-    
+
     it "should work when you re-run the command" do
       terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
       result = @article.update_values(terms_update_hash)
-      @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
-      
+      expect(@article.term_values( {":person"=>"0"}, "affiliation" )).to eq(["affiliation1", "affiliation2", "affiliation3"])
+      expect(result).to eq({"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}})
+
       # result = @article.update_values(terms_update_hash)
       # result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
       terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
       @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
       result = @article.update_values(terms_update_hash)
-      @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
+      expect(@article.term_values( {":person"=>"0"}, "affiliation" )).to eq(["affiliation1", "affiliation2", "affiliation3"])
+      expect(result).to eq({"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}})
       result = @article.update_values(terms_update_hash)
-      
+
       terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
       @article = OM::Samples::ModsArticle.from_xml( fixture( File.join("mods_articles","hydrangea_article1.xml") ) )
       result = @article.update_values(terms_update_hash)
-      @article.term_values( {":person"=>"0"}, "affiliation" ).should == ["affiliation1", "affiliation2", "affiliation3"]
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}}
-      
+      expect(@article.term_values( {":person"=>"0"}, "affiliation" )).to eq(["affiliation1", "affiliation2", "affiliation3"])
+      expect(result).to eq({"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}})
+
       # Trying again with a more complex update hash
       terms_update_hash = {[{":person"=>"0"}, "affiliation"]=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, [{:person=>1}, :last_name]=>"Andronicus", [{"person"=>"1"},:first_name]=>["Titus"],[{:person=>1},:role]=>["otherrole1","otherrole2"] }
       result = @article.update_values(terms_update_hash)
-      result.should == {"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}}
-      @article.should be_changed
+      expect(result).to eq({"person_0_affiliation"=>{"0"=>"affiliation1", "1"=>"affiliation2", "2"=>"affiliation3"}, "person_1_last_name"=>{"0"=>"Andronicus"},"person_1_first_name"=>{"0"=>"Titus"}, "person_1_role"=>{"0"=>"otherrole1","1"=>"otherrole2"}})
+      expect(@article).to be_changed
     end
   end
-  
 
-  
+
+
 end

data/spec/unit/om_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe "OM" do
-  
-  describe "#{}destringify" do
+
+  describe "#destringify" do
     it "should recursively change any strings beginning with : to symbols and any number strings to integers" do
-      OM.destringify( [{":person"=>"0"}, ":last_name"] ).should == [{:person=>0}, :last_name]
-      OM.destringify( [{"person"=>"3"}, "last_name"] ).should == [{:person=>3}, :last_name]
+      expect(OM.destringify( [{":person"=>"0"}, ":last_name"] )).to eq([{:person=>0}, :last_name])
+      expect(OM.destringify( [{"person"=>"3"}, "last_name"] )).to eq([{:person=>3}, :last_name])
     end
   end
-  
+
 end

data/spec/unit/template_registry_spec.rb

@@ -22,7 +22,7 @@ describe "OM::XML::TemplateRegistry" do
 
     end
   end
-  
+
   after(:all) do
     Object.send(:remove_const, :RegistryTest)
   end
@@ -35,193 +35,193 @@ describe "OM::XML::TemplateRegistry" do
       :instead => %{<people xmlns="urn:registry-test"><person title="Builder">Bob</person></people>}
     }
   end
-  
+
   describe "template definitions" do
     it "should contain predefined templates" do
-      RegistryTest.template_registry.node_types.should include(:person)
-      RegistryTest.template_registry.node_types.should_not include(:zombie)
+      expect(RegistryTest.template_registry.node_types).to include(:person)
+      expect(RegistryTest.template_registry.node_types).not_to include(:zombie)
     end
 
     it "should define new templates" do
-      RegistryTest.template_registry.node_types.should_not include(:zombie)
+      expect(RegistryTest.template_registry.node_types).not_to include(:zombie)
       RegistryTest.define_template :zombie do |xml,name|
         xml.monster(:wants => 'braaaaainz') do
           xml.text(name)
         end
       end
-      RegistryTest.template_registry.node_types.should include(:zombie)
+      expect(RegistryTest.template_registry.node_types).to include(:zombie)
     end
 
     it "should instantiate a detached node from a template" do
       node = RegistryTest.template_registry.instantiate(:zombie, 'Zeke')
       expectation = Nokogiri::XML('<monster wants="braaaaainz">Zeke</monster>').root
-      node.should be_equivalent_to(expectation)
+      expect(node).to be_equivalent_to(expectation)
     end
-    
+
     it "should raise an error when trying to instantiate an unknown node_type" do
-      lambda { RegistryTest.template_registry.instantiate(:demigod, 'Hercules') }.should raise_error(NameError)
+      expect { RegistryTest.template_registry.instantiate(:demigod, 'Hercules') }.to raise_error(NameError)
     end
-    
+
     it "should raise an exception if a missing method name doesn't match a node_type" do
-      lambda { RegistryTest.template_registry.demigod('Hercules') }.should raise_error(NameError)
+      expect { RegistryTest.template_registry.demigod('Hercules') }.to raise_error(NameError)
     end
-    
+
     it "should undefine existing templates" do
-      RegistryTest.template_registry.node_types.should include(:zombie)
+      expect(RegistryTest.template_registry.node_types).to include(:zombie)
       RegistryTest.template_registry.undefine :zombie
-      RegistryTest.template_registry.node_types.should_not include(:zombie)
+      expect(RegistryTest.template_registry.node_types).not_to include(:zombie)
     end
-    
+
     it "should complain if the template name isn't a symbol" do
-      lambda { RegistryTest.template_registry.define("die!") { |xml| xml.this_never_happened } }.should raise_error(TypeError)
+      expect { RegistryTest.template_registry.define("die!") { |xml| xml.this_never_happened } }.to raise_error(TypeError)
     end
-    
+
     it "should report on whether a given template is defined" do
-      RegistryTest.template_registry.has_node_type?(:person).should == true
-      RegistryTest.template_registry.has_node_type?(:zombie).should == false
+      expect(RegistryTest.template_registry.has_node_type?(:person)).to eq(true)
+      expect(RegistryTest.template_registry.has_node_type?(:zombie)).to eq(false)
     end
-    
+
     it "should include defined node_types as method names for introspection" do
-      RegistryTest.template_registry.methods.should include('person')
+      expect(RegistryTest.template_registry.methods).to include('person')
     end
   end
-  
+
   describe "template-based document manipulations" do
     it "should accept a Nokogiri::XML::Node as target" do
       @test_document.template_registry.after(@test_document.ng_xml.root.elements.first, :person, 'Bob', 'Builder')
-      @test_document.ng_xml.root.elements.length.should == 2
+      expect(@test_document.ng_xml.root.elements.length).to eq(2)
     end
 
     it "should accept a Nokogiri::XML::NodeSet as target" do
       @test_document.template_registry.after(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
-      @test_document.ng_xml.root.elements.length.should == 2
+      expect(@test_document.ng_xml.root.elements.length).to eq(2)
     end
-    
+
     it "should instantiate a detached node from a template using the template name as a method" do
       node = RegistryTest.template_registry.person('Odin', 'All-Father')
       expectation = Nokogiri::XML('<person title="All-Father">Odin</person>').root
-      node.should be_equivalent_to(expectation)
+      expect(node).to be_equivalent_to(expectation)
     end
-    
+
     it "should add_child" do
       return_value = @test_document.template_registry.add_child(@test_document.ng_xml.root, :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 1).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 1).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:after]).respecting_element_order
     end
-    
+
     it "should add_next_sibling" do
       return_value = @test_document.template_registry.add_next_sibling(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 1).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 1).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should add_previous_sibling" do
       return_value = @test_document.template_registry.add_previous_sibling(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 0).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 0).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should after" do
       return_value = @test_document.template_registry.after(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 0).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 0).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should before" do
       return_value = @test_document.template_registry.before(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 1).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 1).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should replace" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.template_registry.replace(target_node, :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 0).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 0).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
 
     it "should swap" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.template_registry.swap(target_node, :person, 'Bob', 'Builder')
-      return_value.should == target_node
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
+      expect(return_value).to eq(target_node)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
-    
+
     it "should yield the result if a block is given" do
       target_node = @test_document.find_by_terms(:person => 0).first
       expectation = Nokogiri::XML('<person xmlns="urn:registry-test" title="Actor">Alice</person>').root
-      @test_document.template_registry.swap(target_node, :person, 'Bob', 'Builder') { |old_node|
-        old_node.should be_equivalent_to(expectation)
+      expect(@test_document.template_registry.swap(target_node, :person, 'Bob', 'Builder') { |old_node|
+        expect(old_node).to be_equivalent_to(expectation)
         old_node
-      }.should be_equivalent_to(expectation)
+      }).to be_equivalent_to(expectation)
     end
   end
-    
+
   describe "document-based document manipulations" do
     it "should accept a Nokogiri::XML::Node as target" do
       @test_document.after_node(@test_document.ng_xml.root.elements.first, :person, 'Bob', 'Builder')
-      @test_document.ng_xml.root.elements.length.should == 2
+      expect(@test_document.ng_xml.root.elements.length).to eq(2)
     end
 
     it "should accept a Nokogiri::XML::NodeSet as target" do
       @test_document.after_node(@test_document.find_by_terms(:person => 0), :person, 'Bob', 'Builder')
-      @test_document.ng_xml.root.elements.length.should == 2
+      expect(@test_document.ng_xml.root.elements.length).to eq(2)
     end
-    
+
     it "should accept a term-pointer array as target" do
       @test_document.after_node([:person => 0], :person, 'Bob', 'Builder')
-      @test_document.ng_xml.root.elements.length.should == 2
+      expect(@test_document.ng_xml.root.elements.length).to eq(2)
     end
-    
+
     it "should instantiate a detached node from a template" do
       node = @test_document.template(:person, 'Odin', 'All-Father')
       expectation = Nokogiri::XML('<person title="All-Father">Odin</person>').root
-      node.should be_equivalent_to(expectation)
+      expect(node).to be_equivalent_to(expectation)
     end
 
     it "should add_child_node" do
       return_value = @test_document.add_child_node(@test_document.ng_xml.root, :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 1).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 1).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:after]).respecting_element_order
     end
-    
+
     it "should add_next_sibling_node" do
       return_value = @test_document.add_next_sibling_node([:person => 0], :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 1).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 1).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should add_previous_sibling_node" do
       return_value = @test_document.add_previous_sibling_node([:person => 0], :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 0).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 0).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should after_node" do
       return_value = @test_document.after_node([:person => 0], :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 0).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:after]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 0).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:after]).respecting_element_order
     end
 
     it "should before_node" do
       return_value = @test_document.before_node([:person => 0], :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 1).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:before]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 1).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:before]).respecting_element_order
     end
 
     it "should replace_node" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.replace_node(target_node, :person, 'Bob', 'Builder')
-      return_value.should == @test_document.find_by_terms(:person => 0).first
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
+      expect(return_value).to eq(@test_document.find_by_terms(:person => 0).first)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
 
     it "should swap_node" do
       target_node = @test_document.find_by_terms(:person => 0).first
       return_value = @test_document.swap_node(target_node, :person, 'Bob', 'Builder')
-      return_value.should == target_node
-      @test_document.ng_xml.should be_equivalent_to(@expectations[:instead]).respecting_element_order
+      expect(return_value).to eq(target_node)
+      expect(@test_document.ng_xml).to be_equivalent_to(@expectations[:instead]).respecting_element_order
     end
   end
-  
+
 end