mods_display 0.3.3 → 0.3.4

data/spec/fields/related_item_spec.rb

@@ -1,63 +1,65 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_item(mods_record)
-  ModsDisplay::RelatedItem.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::RelatedItem.new(mods_record, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::RelatedItem do
+  include RelatedItemFixtures
+
   before(:all) do
-    @item = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo>A Related Item</titleInfo></relatedItem></mods>", false).related_item
-    @linked_item = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo>A Related Item</titleInfo><location><url>http://library.stanford.edu/</url></location></relatedItem></mods>", false).related_item
-    @collection = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo>This is a Collection</titleInfo><typeOfResource collection='yes' /></relatedItem></mods>", false).related_item
-    @display_label = Stanford::Mods::Record.new.from_str("<mods><relatedItem displayLabel='Special Item'><titleInfo>A Related Item</titleInfo></relatedItem></mods>", false).related_item
-    @location = Stanford::Mods::Record.new.from_str("<mods><relatedItem><location>The Location</location></relatedItem></mods>", false).related_item
-    @reference = Stanford::Mods::Record.new.from_str("<mods><relatedItem type='isReferencedBy'><titleInfo>The title</titleInfo><note>124</note><originInfo><dateOther>DATE</dateOther></originInfo></relatedItem></mods>", false).related_item
-    @blank_item = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo><title></title></titleInfo><location><url></url></location></relatedItem></mods>", false).related_item
-    @multi_items = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo><title>Library</title></titleInfo><location><url>http://library.stanford.edu</url></location></relatedItem><relatedItem><titleInfo><title>SDR</title></titleInfo><location><url>http://purl.stanford.edu</url></location></relatedItem></mods>", false).related_item
+    @item = Stanford::Mods::Record.new.from_str(basic_related_item_fixture, false).related_item
+    @linked_item = Stanford::Mods::Record.new.from_str(linked_related_item_fixture, false).related_item
+    @collection = Stanford::Mods::Record.new.from_str(related_item_collection_fixture, false).related_item
+    @display_label = Stanford::Mods::Record.new.from_str(related_item_display_label_fixture, false).related_item
+    @location = Stanford::Mods::Record.new.from_str(related_item_location_fixture, false).related_item
+    @reference = Stanford::Mods::Record.new.from_str(related_item_reference_fixture, false).related_item
+    @blank_item = Stanford::Mods::Record.new.from_str(blank_related_item_fixture, false).related_item
+    @multi_items = Stanford::Mods::Record.new.from_str(multi_related_item_fixture, false).related_item
   end
-  describe "label" do
-    it "should default to Related Item" do
-      mods_display_item(@item).fields.first.label.should == "Related item:"
+  describe 'label' do
+    it 'should default to Related Item' do
+      expect(mods_display_item(@item).fields.first.label).to eq('Related item:')
     end
-    it "should get the location label" do
-      mods_display_item(@location).fields.first.label.should == "Location:"
+    it 'should get the location label' do
+      expect(mods_display_item(@location).fields.first.label).to eq('Location:')
     end
-    it "should get the reference label" do
-      mods_display_item(@reference).fields.first.label.should == "Referenced by:"
+    it 'should get the reference label' do
+      expect(mods_display_item(@reference).fields.first.label).to eq('Referenced by:')
     end
-    it "should get the displayLabel if available" do
-      mods_display_item(@display_label).fields.first.label.should == "Special Item:"
+    it 'should get the displayLabel if available' do
+      expect(mods_display_item(@display_label).fields.first.label).to eq('Special Item:')
     end
   end
-  describe "fields" do
-    it "should get a location if it is available" do
+  describe 'fields' do
+    it 'should get a location if it is available' do
       fields = mods_display_item(@item).fields
-      fields.length.should == 1
-      fields.first.values.should == ["A Related Item"]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq(['A Related Item'])
     end
-    it "should return a link if there is a location/url present" do
+    it 'should return a link if there is a location/url present' do
       fields = mods_display_item(@linked_item).fields
-      fields.length.should == 1
-      fields.first.values.should == ["<a href='http://library.stanford.edu/'>A Related Item</a>"]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq(["<a href='http://library.stanford.edu/'>A Related Item</a>"])
     end
-    it "should not return any fields if the described related item is a collection" do
-      mods_display_item(@collection).fields.should == []
+    it 'should not return any fields if the described related item is a collection' do
+      expect(mods_display_item(@collection).fields).to eq([])
     end
-    it "should not return empty links when there is no title or link" do
-      mods_display_item(@blank_item).fields.should == []
+    it 'should not return empty links when there is no title or link' do
+      expect(mods_display_item(@blank_item).fields).to eq([])
     end
-    it "should concat the isReferencedBy related item title with other metadata" do
+    it 'should concat the isReferencedBy related item title with other metadata' do
       fields = mods_display_item(@reference).fields
-      fields.length.should == 1
-      fields.first.values.should == ["The title DATE 124"]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq(['The title DATE 124'])
     end
-    it "should collapse labels down into the same record" do
+    it 'should collapse labels down into the same record' do
       fields = mods_display_item(@multi_items).fields
-      fields.length.should == 1
-      fields.first.label.should == "Related item:"
-      fields.first.values.length.should == 2
-      fields.first.values.first.should =~ /<a href=.*>Library<\/a>/ or
-      fields.first.values.last.should =~ /<a href=.*>SDR<\/a>/
+      expect(fields.length).to eq(1)
+      expect(fields.first.label).to eq('Related item:')
+      expect(fields.first.values.length).to eq(2)
+      expect(fields.first.values.first).to(match(%r{<a href=.*>Library</a>}))
+      expect(fields.first.values.last).to(match(%r{<a href=.*>SDR</a>}))
     end
   end
-end
+end

data/spec/fields/resource_type_spec.rb

@@ -1,28 +1,34 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_resource_type(mods_record)
-  ModsDisplay::ResourceType.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::ResourceType.new(mods_record, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::ResourceType do
   before(:all) do
-    @type = Stanford::Mods::Record.new.from_str("<mods><typeOfResource>Resource Type</typeOfResource></mods>", false).typeOfResource
-    @downcase = Stanford::Mods::Record.new.from_str("<mods><typeOfResource>resource type</typeOfResource></mods>", false).typeOfResource
-    @display_label = Stanford::Mods::Record.new.from_str("<mods><typeOfResource displayLabel='Special label'>Resource Type</typeOfResource></mods>", false).typeOfResource
+    @type = Stanford::Mods::Record.new.from_str(
+      '<mods><typeOfResource>Resource Type</typeOfResource></mods>', false
+    ).typeOfResource
+    @downcase = Stanford::Mods::Record.new.from_str(
+      '<mods><typeOfResource>resource type</typeOfResource></mods>', false
+    ).typeOfResource
+    @display_label = Stanford::Mods::Record.new.from_str(
+      "<mods><typeOfResource displayLabel='Special label'>Resource Type</typeOfResource></mods>", false
+    ).typeOfResource
   end
   it "should default to a label of 'Type of resource'" do
     fields = mods_display_resource_type(@type).fields
-    fields.length.should == 1
-    fields.first.label.should == "Type of resource:"
+    expect(fields.length).to eq(1)
+    expect(fields.first.label).to eq('Type of resource:')
   end
-  it "should use the displayLabel attribute when present" do
+  it 'should use the displayLabel attribute when present' do
     fields = mods_display_resource_type(@display_label).fields
-    fields.length.should == 1
-    fields.first.label.should == "Special label:"
+    expect(fields.length).to eq(1)
+    expect(fields.first.label).to eq('Special label:')
   end
-  it "should capitalize the first letter of the values" do
+  it 'should capitalize the first letter of the values' do
     fields = mods_display_resource_type(@downcase).fields
-    fields.length.should == 1
-    fields.first.values.should == ["Resource type"]
+    expect(fields.length).to eq(1)
+    expect(fields.first.values).to eq(['Resource type'])
   end
-end
+end

data/spec/fields/sub_title_spec.rb

@@ -1,18 +1,20 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_sub_title(mods_record)
-  ModsDisplay::SubTitle.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::SubTitle.new(mods_record, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::SubTitle do
   before(:all) do
-    @title = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Main Title</title></titleInfo><titleInfo><title>Sub Title</title></titleInfo></mods>", false).title_info
+    @title = Stanford::Mods::Record.new.from_str(
+      '<mods><titleInfo><title>Main Title</title></titleInfo><titleInfo><title>Sub Title</title></titleInfo></mods>',
+      false
+    ).title_info
   end
-  it "omit the main title and only return sub titles" do
+  it 'omit the main title and only return sub titles' do
     fields = mods_display_sub_title(@title).fields
-    fields.length.should == 1
-    fields.first.label.should == "Title:"
-    fields.first.values.should == ["Sub Title"]
-    
+    expect(fields.length).to eq(1)
+    expect(fields.first.label).to eq('Title:')
+    expect(fields.first.values).to eq(['Sub Title'])
   end
-end
+end

data/spec/fields/subject_spec.rb

@@ -1,10 +1,10 @@
-require "spec_helper"
-require "fixtures/subjects_fixtures"
+require 'spec_helper'
+require 'fixtures/subjects_fixtures'
 include SubjectsFixtures
 
 def mods_display_subject(mods_record)
   config = ModsDisplay::Configuration::Subject.new do
-    link :link_method, "%value%"
+    link :link_method, '%value%'
   end
   ModsDisplay::Subject.new(mods_record, config, TestController.new)
 end
@@ -12,7 +12,7 @@ end
 def mods_display_hierarchical_subject(mods_record)
   config = ModsDisplay::Configuration::Subject.new do
     hierarchical_link true
-    link :link_method, "%value%"
+    link :link_method, '%value%'
   end
   ModsDisplay::Subject.new(mods_record, config, TestController.new)
 end
@@ -24,86 +24,91 @@ describe ModsDisplay::Subject do
     @emdash_subject = Stanford::Mods::Record.new.from_str(emdash_subjects, false).subject
     @geo_subject = Stanford::Mods::Record.new.from_str(hierarchical_geo_subjects, false).subject
     @name_subject = Stanford::Mods::Record.new.from_str(name_subjects, false).subject
+    @blank_name_subject = Stanford::Mods::Record.new.from_str(blank_name_subject, false).subject
     @complex_subject = Stanford::Mods::Record.new.from_str(complex_subjects, false).subject
     @display_label = Stanford::Mods::Record.new.from_str(display_label_subjects, false).subject
   end
-  describe "fields" do
-    it "should split individual child elments of subject into separate parts" do
+  describe 'fields' do
+    it 'should split individual child elments of subject into separate parts' do
       fields = mods_display_subject(@subject).fields
-      fields.length.should == 1
-      fields.first.values.should == [["Jazz", "Japan", "History and criticism"]]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq([['Jazz', 'Japan', 'History and criticism']])
     end
-    it "should split horizontalized subjects split with an emdash into separate parts" do
+    it 'should split horizontalized subjects split with an emdash into separate parts' do
       fields = mods_display_subject(@emdash_subject).fields
-      fields.length.should == 1
-      fields.first.values.should == [["Jazz", "Japan", "History and criticism"]]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq([['Jazz', 'Japan', 'History and criticism']])
     end
-    it "should handle hierarchicalGeogaphic subjects properly" do
+    it 'should handle hierarchicalGeogaphic subjects properly' do
       fields = mods_display_subject(@geo_subject).fields
-      fields.length.should == 1
-      fields.first.values.should == [["United States", "California", "Stanford"]]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq([['United States', 'California', 'Stanford']])
     end
-    it "should handle display labels properly" do
+    it 'should handle display labels properly' do
       fields = mods_display_subject(@display_label).fields
-      fields.length.should == 3
-      fields.first.label.should  == "Subject:"
-      fields.first.values.should == [["A Subject", "Another Subject"], ["B Subject", "Another B Subject"]]
-      fields[1].label.should     == "Subject Heading:"
-      fields[1].values.should    == [["Jazz", "Japan", "History and criticism"]]
-      fields.last.label.should   == "Subject:"
-      fields.last.values.should  == [["Bay Area", "Stanford"]]
+      expect(fields.length).to eq(3)
+      expect(fields.first.label).to eq('Subject:')
+      expect(fields.first.values).to eq([['A Subject', 'Another Subject'], ['B Subject', 'Another B Subject']])
+      expect(fields[1].label).to eq('Subject Heading:')
+      expect(fields[1].values).to eq([['Jazz', 'Japan', 'History and criticism']])
+      expect(fields.last.label).to eq('Subject:')
+      expect(fields.last.values).to eq([['Bay Area', 'Stanford']])
     end
-    it "should handle blank subjects properly" do
-      mods_display_subject(@blank_subject).fields.should == []
+    it 'should handle blank subjects properly' do
+      expect(mods_display_subject(@blank_subject).fields).to eq([])
+    end
+    it 'should handle blank name subjects properly' do
+      expect(mods_display_subject(@blank_name_subject).fields).to eq([])
     end
   end
 
-  describe "name subjects" do
-    it "should handle name subjects properly" do
+  describe 'name subjects' do
+    it 'should handle name subjects properly' do
       fields = mods_display_subject(@name_subject).fields
-      fields.length.should == 1
-      fields.first.values.first.first.should be_a(ModsDisplay::Name::Person)
-      fields.first.values.first.first.name.should == "John Doe"
-      fields.first.values.first.first.roles.should == ["Depicted"]
+      expect(fields.length).to eq(1)
+      expect(fields.first.values.first.first).to be_a(ModsDisplay::Name::Person)
+      expect(fields.first.values.first.first.name).to eq('John Doe')
+      expect(fields.first.values.first.first.roles).to eq(['Depicted'])
     end
-    it "should link the name (and not the role) correctly" do
+    it 'should link the name (and not the role) correctly' do
       html = mods_display_subject(@name_subject).to_html
-      html.should match(/<a href='.*\?John Doe'>John Doe<\/a> \(Depicted\)/)
-      html.should match(/<a href='.*\?Anonymous People'>Anonymous People<\/a>/)
+      expect(html).to match(%r{<a href='.*\?John Doe'>John Doe</a> \(Depicted\)})
+      expect(html).to match(%r{<a href='.*\?Anonymous People'>Anonymous People</a>})
     end
-    it "should linke the name (and not the role) correctly when linking hierarchicaly" do
+    it 'should linke the name (and not the role) correctly when linking hierarchicaly' do
       html = mods_display_hierarchical_subject(@name_subject).to_html
-      html.should match(/<a href='.*\?John Doe'>John Doe<\/a> \(Depicted\)/)
-      html.should match(/<a href='.*\?John Doe Anonymous People'>Anonymous People<\/a>/)
+      expect(html).to match(%r{<a href='.*\?John Doe'>John Doe</a> \(Depicted\)})
+      expect(html).to match(%r{<a href='.*\?John Doe Anonymous People'>Anonymous People</a>})
     end
   end
 
-  describe "to_html" do
-    it "should link the values when requested" do
+  describe 'to_html' do
+    it 'should link the values when requested' do
       html = mods_display_subject(@subject).to_html
-      html.should match(/<a href='http:\/\/library.stanford.edu\?Jazz'>Jazz<\/a>/)
-      html.should match(/<a href='http:\/\/library.stanford.edu\?Japan'>Japan<\/a>/)
-      html.should match(/<a href='http:\/\/library.stanford.edu\?History and criticism'>History and criticism<\/a>/)
+      expect(html).to match(%r{<a href='http://library.stanford.edu\?Jazz'>Jazz</a>})
+      expect(html).to match(%r{<a href='http://library.stanford.edu\?Japan'>Japan</a>})
+      expect(html).to match(%r{<a href='http://library.stanford.edu\?History and criticism'>History and criticism</a>})
     end
-    it "does something" do
+    it 'does something' do
       html = mods_display_hierarchical_subject(@subject).to_html
-      html.should match(/<a href='http:\/\/library.stanford.edu\?Jazz'>Jazz<\/a>/)
-      html.should match(/<a href='http:\/\/library.stanford.edu\?Jazz Japan'>Japan<\/a>/)
-      html.should match(/<a href='http:\/\/library.stanford.edu\?Jazz Japan History and criticism'>History and criticism<\/a>/)
+      expect(html).to match(%r{<a href='http://library.stanford.edu\?Jazz'>Jazz</a>})
+      expect(html).to match(%r{<a href='http://library.stanford.edu\?Jazz Japan'>Japan</a>})
+      expect(html).to match(
+        %r{<a href='http://library.stanford.edu\?Jazz Japan History and criticism'>History and criticism</a>}
+      )
     end
-    it "should collapse fields into the same label" do
+    it 'should collapse fields into the same label' do
       html = mods_display_subject(@complex_subject).to_html
-      html.scan(/<dt title='Subject'>Subject:<\/dt>/).length.should == 1
-      html.scan(/<dd>/).length.should == 1
-      html.scan(/<br\/>/).length.should == 1
-      html.scan(/ &gt; /).length.should == 3
+      expect(html.scan(%r{<dt title='Subject'>Subject:</dt>}).length).to eq(1)
+      expect(html.scan(/<dd>/).length).to eq(1)
+      expect(html.scan(%r{<br/>}).length).to eq(1)
+      expect(html.scan(/ &gt; /).length).to eq(3)
     end
-    it "should handle complex display labels" do
+    it 'should handle complex display labels' do
       html = mods_display_subject(@display_label).to_html
-      html.scan(/<dt title='Subject'>Subject:<\/dt>/).length.should eq 2
-      html.scan(/<dt title='Subject Heading'>Subject Heading:<\/dt>/).length.should eq 1
-      html.scan(/<dd>/).length.should == 3
+      expect(html.scan(%r{<dt title='Subject'>Subject:</dt>}).length).to eq 2
+      expect(html.scan(%r{<dt title='Subject Heading'>Subject Heading:</dt>}).length).to eq 1
+      expect(html.scan(/<dd>/).length).to eq(3)
     end
   end
-
-end
+end

data/spec/fields/title_spec.rb

@@ -1,61 +1,74 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_title(mods_record)
-  ModsDisplay::Title.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::Title.new(mods_record, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::Title do
+  include TitleFixtures
   before(:all) do
-    @title = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Title</title></titleInfo></mods>", false).title_info
-    @title_parts = Stanford::Mods::Record.new.from_str("<mods><titleInfo><nonSort>The</nonSort><title>Title</title><subTitle>For</subTitle><partName>Something</partName><partNumber>Part 62</partNumber></titleInfo></mods>", false).title_info
-    @reverse_title_parts = Stanford::Mods::Record.new.from_str("<mods><titleInfo><nonSort>The</nonSort><title>Title</title><subTitle>For</subTitle><partNumber>Part 62</partNumber><partName>Something</partName></titleInfo></mods>", false).title_info
-    @display_label = Stanford::Mods::Record.new.from_str("<mods><titleInfo displayLabel='MyTitle'><title>Title</title></titleInfo></mods>", false).title_info
-    @display_form = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Title</title><displayForm>The Title of This Item</displayForm></titleInfo></mods>", false).title_info
-    @multi_label = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Main Title</title></titleInfo><titleInfo type='alternative'><title>Alt Title</title></titleInfo><titleInfo type='uniform'><title>Uniform Title</title></titleInfo><titleInfo type='alternative'><title>Another Alt Title</title></titleInfo><titleInfo type='alternative'><title>Yet Another Alt Title</title></titleInfo></mods>", false).title_info
-    @alt_title = Stanford::Mods::Record.new.from_str("<mods><titleInfo type='alternative'><title>Title</title></titleInfo></mods>", false).title_info
+    @title = Stanford::Mods::Record.new.from_str(simple_title_fixture, false).title_info
+    @title_parts = Stanford::Mods::Record.new.from_str(title_parts_fixture, false).title_info
+    @reverse_title_parts = Stanford::Mods::Record.new.from_str(reverse_title_parts_fixture, false).title_info
+    @display_label = Stanford::Mods::Record.new.from_str(display_label_fixture, false).title_info
+    @display_form = Stanford::Mods::Record.new.from_str(display_form_fixture, false).title_info
+    @multi_label = Stanford::Mods::Record.new.from_str(multi_label_fixture, false).title_info
+    @alt_title = Stanford::Mods::Record.new.from_str(alt_title_fixture, false).title_info
+    @title_punctuation = Stanford::Mods::Record.new.from_str(title_puncutation_fixture, false).title_info
   end
-  describe "labels" do
-    it "should return a default label of Title if nothing else is available" do
-      mods_display_title(@title).fields.first.label.should == "Title:"
+  describe 'labels' do
+    it 'should return a default label of Title if nothing else is available' do
+      expect(mods_display_title(@title).fields.first.label).to eq('Title:')
     end
-    it "should return an appropriate label from the type attribute" do
-      mods_display_title(@alt_title).fields.first.label.should == "Alternative title:"
+    it 'should return an appropriate label from the type attribute' do
+      expect(mods_display_title(@alt_title).fields.first.label).to eq('Alternative title:')
     end
-    it "should return the label held in the displayLabel attribute of the titleInfo element when available" do
-      mods_display_title(@display_label).fields.first.label.should == "MyTitle:"
+    it 'should return the label held in the displayLabel attribute of the titleInfo element when available' do
+      expect(mods_display_title(@display_label).fields.first.label).to eq('MyTitle:')
     end
-    it "should collapse adjacent identical labels" do
+    it 'should collapse adjacent identical labels' do
       fields = mods_display_title(@multi_label).fields
-      fields.length.should == 4
-      fields[0].label.should == "Title:"
-      fields[1].label.should == "Alternative title:"
-      fields[2].label.should == "Uniform title:"
-      fields[3].label.should == "Alternative title:"
-      fields[3].values.should == ["Another Alt Title", "Yet Another Alt Title"]
+      expect(fields.length).to eq(4)
+      expect(fields[0].label).to eq('Title:')
+      expect(fields[1].label).to eq('Alternative title:')
+      expect(fields[2].label).to eq('Uniform title:')
+      expect(fields[3].label).to eq('Alternative title:')
+      expect(fields[3].values).to eq(['Another Alt Title', 'Yet Another Alt Title'])
     end
   end
-  describe "fields" do
-    it "should return an array of label/value objects" do
+  describe 'fields' do
+    it 'should return an array of label/value objects' do
       values = mods_display_title(@display_label).fields
-      values.length.should == 1
-      values.first.should be_a ModsDisplay::Values
-      values.first.label.should == "MyTitle:"
-      values.first.values.should == ["Title"]
+      expect(values.length).to eq(1)
+      expect(values.first).to be_a ModsDisplay::Values
+      expect(values.first.label).to eq('MyTitle:')
+      expect(values.first.values).to eq(['Title'])
     end
   end
-  describe "text" do
-    it "should construct all the elements in titleInfo" do
-      mods_display_title(@title_parts).fields.first.values.should include "The Title : For. Something. Part 62"
+  describe 'text' do
+    it 'should construct all the elements in titleInfo' do
+      expect(mods_display_title(@title_parts).fields.first.values).to include 'The Title : For. Something. Part 62'
     end
-    it "should use the correct delimiter in the case that a partNumber comes before a partName" do
-      mods_display_title(@reverse_title_parts).fields.first.values.should include "The Title : For. Part 62, Something"
+
+    it 'should use the correct delimiter in the case that a partNumber comes before a partName' do
+      expect(mods_display_title(@reverse_title_parts).fields.first.values).to include(
+        'The Title : For. Part 62, Something'
+      )
+    end
+
+    it 'should use the displayForm when available' do
+      expect(mods_display_title(@display_form).fields.first.values).to include 'The Title of This Item'
     end
-    it "should use the displayForm when available" do
-      mods_display_title(@display_form).fields.first.values.should include "The Title of This Item"
+
+    it 'should return the basic text held in a sub element of titleInfo' do
+      expect(mods_display_title(@title).fields.first.values).to include 'Title'
     end
-    it "should return the basic text held in a sub element of titleInfo" do
-      mods_display_title(@title).fields.first.values.should include "Title"
+
+    it 'should not duplicate delimiter punctuation' do
+      values = mods_display_title(@title_punctuation).fields.first.values
+      expect(values.length).to eq 1
+      expect(values.first).not_to include '..'
+      expect(values.first).to eq 'A title that ends in punctuation. 2015'
     end
   end
-  
-end
+end