mods_display 0.3.3 → 0.3.4

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.3.3"
+  VERSION = '0.3.4'
 end

data/mods_display.gemspec

@@ -4,22 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mods_display/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "mods_display"
+  gem.name          = 'mods_display'
   gem.version       = ModsDisplay::VERSION
-  gem.authors       = ["Jessie Keck"]
-  gem.email         = ["jessie.keck@gmail.com"]
-  gem.description   = %q{MODS Display is a gem to centralize the display logic of MODS medadata.}
-  gem.summary       = %q{The MODS Display gem allows implementers to configure a customized display of MODS metadata.  This display implements the specifications defined at Stanford for how to display MODS.}
-  gem.homepage      = "https://github.com/sul-dlss/mods_display"
+  gem.authors       = ['Jessie Keck']
+  gem.email         = ['jessie.keck@gmail.com']
+  gem.description   = 'MODS Display is a gem to centralize the display logic of MODS medadata.'
+  gem.summary       = 'The MODS Display gem allows implementers to configure a customized display of MODS metadata.  This display implements the specifications defined at Stanford for how to display MODS.'
+  gem.homepage      = 'https://github.com/sul-dlss/mods_display'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(spec)/})
-  gem.require_paths = ["lib"]
-  
+  gem.require_paths = ['lib']
+
   gem.add_dependency 'stanford-mods'
   gem.add_dependency 'i18n'
-  
+
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rubocop'
 end

data/spec/configuration/access_condition_spec.rb

@@ -1,10 +1,10 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe ModsDisplay::Configuration::AccessCondition do
-  it "should default ignore? to true" do
-    ModsDisplay::Configuration::AccessCondition.new.ignore?.should be_true
+  it 'should default ignore? to true' do
+    expect(ModsDisplay::Configuration::AccessCondition.new.ignore?).to be true
   end
-  it "should set ignore? to false when the display! configuration is set" do
-    ModsDisplay::Configuration::AccessCondition.new{ display! }.ignore?.should be_false
+  it 'should set ignore? to false when the display! configuration is set' do
+    expect(ModsDisplay::Configuration::AccessCondition.new { display! }.ignore?).to be false
   end
 end

data/spec/configuration/base_spec.rb

@@ -1,39 +1,39 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe ModsDisplay::Configuration::Base do
-  it "should set config options w/ a block" do
-    config = ModsDisplay::Configuration::Base.new do 
-      label_class "testing_label_class"
-      value_class "testing_value_class"
+  it 'should set config options w/ a block' do
+    config = ModsDisplay::Configuration::Base.new do
+      label_class 'testing_label_class'
+      value_class 'testing_value_class'
     end
-    config.label_class.should == "testing_label_class"
-    config.value_class.should == "testing_value_class"
+    expect(config.label_class).to eq('testing_label_class')
+    expect(config.value_class).to eq('testing_value_class')
   end
-  describe "link" do
-    it "should return an array with a method name and params" do
-      ModsDisplay::Configuration::Base.new do
+  describe 'link' do
+    it 'should return an array with a method name and params' do
+      expect(ModsDisplay::Configuration::Base.new do
         link :my_url_generating_method, q: '"%value%"'
-      end.link.should == [:my_url_generating_method, {:q => '"%value%"'}]
+      end.link).to eq([:my_url_generating_method, { q: '"%value%"' }])
     end
   end
-  describe "delmiter" do
-    it "should override the default delimiter" do
-      ModsDisplay::Configuration::Base.new do
-        delimiter "<br/>"
-      end.delimiter.should == "<br/>"
+  describe 'delmiter' do
+    it 'should override the default delimiter' do
+      expect(ModsDisplay::Configuration::Base.new do
+        delimiter '<br/>'
+      end.delimiter).to eq('<br/>')
     end
     it "should default to ', '" do
-      ModsDisplay::Configuration::Base.new.delimiter.should == ", "
+      expect(ModsDisplay::Configuration::Base.new.delimiter).to eq(', ')
     end
   end
-  describe "ignore" do
-    it "should be set to true if the #ignore! method is called" do
-      ModsDisplay::Configuration::Base.new do
+  describe 'ignore' do
+    it 'should be set to true if the #ignore! method is called' do
+      expect(ModsDisplay::Configuration::Base.new do
         ignore!
-      end.ignore?.should be_true
+      end.ignore?).to be true
     end
-    it "should be false by default" do
-      ModsDisplay::Configuration::Base.new.ignore?.should be_false
+    it 'should be false by default' do
+      expect(ModsDisplay::Configuration::Base.new.ignore?).to be false
     end
   end
-end
+end

data/spec/fields/abstract_spec.rb

@@ -1,29 +1,39 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_abstract(mods_record)
-  ModsDisplay::Abstract.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::Abstract.new(mods_record, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::Abstract do
   before(:all) do
-    @link = Stanford::Mods::Record.new.from_str("<mods><abstract>A link to the library (http://library.stanford.edu) should appear here</abstract></mods>", false).abstract
-    @email = Stanford::Mods::Record.new.from_str("<mods><abstract>A link to an email address jdoe@example.com should appear here</abstract></mods>", false).abstract
+    @link = Stanford::Mods::Record.new.from_str(
+      '<mods><abstract>A link to the library (http://library.stanford.edu) should appear here</abstract></mods>', false
+    ).abstract
+    @email = Stanford::Mods::Record.new.from_str(
+      '<mods><abstract>A link to an email address jdoe@example.com should appear here</abstract></mods>', false
+    ).abstract
   end
-  
-  describe "labels" do
+
+  describe 'labels' do
     it "should get a default 'Abstract' label" do
       fields = mods_display_abstract(@link).fields
-      fields.length.should == 1
-      fields.first.label.should == "Abstract:"
+      expect(fields.length).to eq(1)
+      expect(fields.first.label).to eq('Abstract:')
     end
   end
 
-  describe "links" do
-    it "should turn URLs into links" do
-      mods_display_abstract(@link).to_html.should match(/A link to the library \(<a href='http:\/\/library.stanford.edu'>http:\/\/library.stanford.edu<\/a>\) should appear here/)
+  describe 'links' do
+    it 'should turn URLs into links' do
+      expect(mods_display_abstract(@link).to_html).to match(/A link to the library \(<a href/)
+      expect(mods_display_abstract(@link).to_html).to match(
+        %r{\(<a href='http://library.stanford.edu'>http://library.stanford.edu</a>\)}
+      )
+      expect(mods_display_abstract(@link).to_html).to match(%r{</a>\) should appear here})
     end
-    it "should turn email addresses into mailto links" do
-      mods_display_abstract(@email).to_html.should match(/A link to an email address <a href='mailto:jdoe@example.com'>jdoe@example.com<\/a> should appear here/)
+    it 'should turn email addresses into mailto links' do
+      expect(mods_display_abstract(@email).to_html).to match(
+        %r{A link to an email address <a href='mailto:jdoe@example.com'>jdoe@example.com</a> should appear here}
+      )
     end
   end
-end
+end

data/spec/fields/access_condition_spec.rb

@@ -1,91 +1,116 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_access_condition(mods_record)
-  ModsDisplay::AccessCondition.new(mods_record, ModsDisplay::Configuration::AccessCondition.new, double("controller"))
+  ModsDisplay::AccessCondition.new(
+    mods_record,
+    ModsDisplay::Configuration::AccessCondition.new,
+    double('controller')
+  )
 end
+
 def mods_display_versioned_access_condition(mods_record, version)
-  ModsDisplay::AccessCondition.new(mods_record, ModsDisplay::Configuration::AccessCondition.new{cc_license_version version}, double("controller"))
+  ModsDisplay::AccessCondition.new(
+    mods_record,
+    ModsDisplay::Configuration::AccessCondition.new { cc_license_version version },
+    double('controller')
+  )
 end
+
 def mods_display_non_ignore_access_condition(mods_record)
-  ModsDisplay::AccessCondition.new(mods_record, ModsDisplay::Configuration::AccessCondition.new{display!}, double("controller"))
+  ModsDisplay::AccessCondition.new(
+    mods_record,
+    ModsDisplay::Configuration::AccessCondition.new { display! },
+    double('controller')
+  )
 end
 
 describe ModsDisplay::AccessCondition do
+  include AccessConditionFixtures
   before :all do
-    @access_condition = Stanford::Mods::Record.new.from_str("<mods><accessCondition>Access Condition Note</accessCondition></mods>", false).accessCondition
-    @restrict_condition = Stanford::Mods::Record.new.from_str("<mods><accessCondition type='restrictionOnAccess'>Restrict Access Note1</accessCondition><accessCondition type='restriction on access'>Restrict Access Note2</accessCondition></mods>", false).accessCondition
-    @copyright_note = Stanford::Mods::Record.new.from_str("<mods><accessCondition type='copyright'>This is a (c) copyright Note.  Single instances of (c) should also be replaced in these notes.</accessCondition></mods>", false).accessCondition
-    @cc_license_note = Stanford::Mods::Record.new.from_str("<mods><accessCondition type='license'>CC by-sa: This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License</accessCondition></mods>", false).accessCondition
-    @odc_license_note = Stanford::Mods::Record.new.from_str("<mods><accessCondition type='license'>ODC pddl: This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)</accessCondition></mods>", false).accessCondition
-    @no_link_license_note = Stanford::Mods::Record.new.from_str("<mods><accessCondition type='license'>Unknown something: This work is licensed under an Unknown License and will not be linked</accessCondition></mods>", false).accessCondition
+    @access_condition = Stanford::Mods::Record.new.from_str(simple_access_condition_fixture, false).accessCondition
+    @restrict_condition = Stanford::Mods::Record.new.from_str(restricted_access_fixture, false).accessCondition
+    @copyright_note = Stanford::Mods::Record.new.from_str(copyright_access_fixture, false).accessCondition
+    @cc_license_note = Stanford::Mods::Record.new.from_str(cc_license_fixture, false).accessCondition
+    @odc_license_note = Stanford::Mods::Record.new.from_str(odc_license_fixture, false).accessCondition
+    @no_link_license_note = Stanford::Mods::Record.new.from_str(no_license_fixture, false).accessCondition
   end
-  describe "labels" do
-    it "should normalize types and assign proper labels" do
+  describe 'labels' do
+    it 'should normalize types and assign proper labels' do
       fields = mods_display_access_condition(@restrict_condition).fields
-      fields.length.should == 1
-      fields.first.label.should == "Restriction on access:"
+      expect(fields.length).to eq(1)
+      expect(fields.first.label).to eq('Restriction on access:')
       fields.first.values.each_with_index do |value, index|
-        value.should match /^Restrict Access Note#{index+1}/
+        expect(value).to match(/^Restrict Access Note#{index + 1}/)
       end
     end
   end
-  describe "fields" do
-    describe "copyright" do
+  describe 'fields' do
+    describe 'copyright' do
       it "should replace instances of '(c) copyright' with the HTML copyright entity" do
         fields = mods_display_access_condition(@copyright_note).fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should == "This is a &copy; Note.  Single instances of &copy; should also be replaced in these notes."
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).to eq(
+          'This is a &copy; Note.  Single instances of &copy; should also be replaced in these notes.'
+        )
       end
     end
-    describe "licenses" do
-      it "should add the appropriate classes to the html around the license" do
+    describe 'licenses' do
+      it 'should add the appropriate classes to the html around the license' do
         fields = mods_display_access_condition(@no_link_license_note).fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should match /^<div class='unknown-something'>.*<\/div>$/
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).to match(%r{^<div class='unknown-something'>.*</div>$})
       end
-      it "should itentify and link CreativeCommons licenses properly" do
+      it 'should itentify and link CreativeCommons licenses properly' do
         fields = mods_display_access_condition(@cc_license_note).fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should include("<a href='http://creativecommons.org/licenses/by-sa/3.0/'>This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License</a>")
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).to include("<a href='http://creativecommons.org/licenses/by-sa/3.0/'>")
+        expect(fields.first.values.first).to include(
+          'This work is licensed under a Creative Commons Attribution-Noncommercial 3.0 Unported License'
+        )
       end
-      it "should itentify and link OpenDataCommons licenses properly" do
+      it 'should itentify and link OpenDataCommons licenses properly' do
         fields = mods_display_access_condition(@odc_license_note).fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should include("<a href='http://opendatacommons.org/licenses/pddl'>This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)</a>")
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).to include("<a href='http://opendatacommons.org/licenses/pddl'>")
+        expect(fields.first.values.first).to include(
+          'This work is licensed under a Open Data Commons Public Domain Dedication and License (PDDL)'
+        )
       end
-      it "should have a configurable version for CC licenses" do
-        fields = mods_display_versioned_access_condition(@cc_license_note, "4.0").fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should include("http://creativecommons.org/licenses/by-sa/4.0/")
-        fields.first.values.first.should_not include("http://creativecommons.org/licenses/by-sa/3.0/")
+      it 'should have a configurable version for CC licenses' do
+        fields = mods_display_versioned_access_condition(@cc_license_note, '4.0').fields
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).to include('http://creativecommons.org/licenses/by-sa/4.0/')
+        expect(fields.first.values.first).not_to include('http://creativecommons.org/licenses/by-sa/3.0/')
       end
-      it "should not apply configured version to NON-CC licenses" do
-        fields = mods_display_versioned_access_condition(@odc_license_note, "4.0").fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should_not include("/4.0/")
+      it 'should not apply configured version to NON-CC licenses' do
+        fields = mods_display_versioned_access_condition(@odc_license_note, '4.0').fields
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).not_to include('/4.0/')
       end
-      it "should not attempt unknown license types" do
+      it 'should not attempt unknown license types' do
         fields = mods_display_access_condition(@no_link_license_note).fields
-        fields.length.should == 1
-        fields.first.values.length.should == 1
-        fields.first.values.first.should     include("This work is licensed under an Unknown License and will not be linked")
-        fields.first.values.first.should_not include("<a.*>")
+        expect(fields.length).to eq(1)
+        expect(fields.first.values.length).to eq(1)
+        expect(fields.first.values.first).to include(
+          'This work is licensed under an Unknown License and will not be linked'
+        )
+        expect(fields.first.values.first).not_to include('<a.*>')
       end
     end
   end
-  describe "to_html" do
-    it "should ignore access conditions by default" do
-      mods_display_access_condition(@access_condition).to_html.should be_nil
+  describe 'to_html' do
+    it 'should ignore access conditions by default' do
+      expect(mods_display_access_condition(@access_condition).to_html).to be_nil
     end
-    it "should not ignore the access condition when ignore is set to false" do
+    it 'should not ignore the access condition when ignore is set to false' do
       html = mods_display_non_ignore_access_condition(@access_condition).to_html
-      html.should match /<dt.*>Access condition:<\/dt><dd>Access Condition Note<\/dd>/
+      expect(html).to match %r{<dt.*>Access condition:</dt><dd>Access Condition Note</dd>}
     end
   end
-end
+end

data/spec/fields/audience_spec.rb

@@ -1,21 +1,24 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_audience(mods_record)
-  ModsDisplay::Audience.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::Audience.new(mods_record, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::Contents do
   before(:all) do
-    @audience = Stanford::Mods::Record.new.from_str("<mods><targetAudience>Audience Note</targetAudience></mods>", false).targetAudience
-    @display_label = Stanford::Mods::Record.new.from_str("<mods><targetAudience displayLabel='Special Label'>Audience Note</tableOfContents></mods>", false).targetAudience
+    @audience = Stanford::Mods::Record.new.from_str(
+      '<mods><targetAudience>Audience Note</targetAudience></mods>', false
+    ).targetAudience
+    @display_label = Stanford::Mods::Record.new.from_str(
+      "<mods><targetAudience displayLabel='Special Label'>Audience Note</tableOfContents></mods>", false
+    ).targetAudience
   end
-  describe "label" do
-    it "should have a default label" do
-      mods_display_audience(@audience).label.should == "Target audience:"
+  describe 'label' do
+    it 'should have a default label' do
+      expect(mods_display_audience(@audience).label).to eq('Target audience:')
     end
-    it "should use the displayLabel attribute when one is available" do
-      mods_display_audience(@display_label).label.should == "Special Label:"
+    it 'should use the displayLabel attribute when one is available' do
+      expect(mods_display_audience(@display_label).label).to eq('Special Label:')
     end
-  end  
-  
-end
+  end
+end

data/spec/fields/cartographics_spec.rb

@@ -1,9 +1,9 @@
-require "spec_helper"
-require "fixtures/cartographics_fixtures"
+require 'spec_helper'
+require 'fixtures/cartographics_fixtures'
 include CartographicsFixtures
 
 def mods_display_cartographics(mods)
-  ModsDisplay::Cartographics.new(mods, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::Cartographics.new(mods, ModsDisplay::Configuration::Base.new, double('controller'))
 end
 
 describe ModsDisplay::Cartographics do
@@ -13,27 +13,26 @@ describe ModsDisplay::Cartographics do
     @no_scale = Stanford::Mods::Record.new.from_str(no_scale_cartographic, false).subject
     @coordinates = Stanford::Mods::Record.new.from_str(coordinates_only, false).subject
   end
-  describe "values" do
-    it "should get the full cartographic note" do
+  describe 'values' do
+    it 'should get the full cartographic note' do
       values = mods_display_cartographics(@cart).fields
-      values.length.should == 1
-      values.first.values.should == ["The scale ; the projection the coordinates"]
+      expect(values.length).to eq(1)
+      expect(values.first.values).to eq(['The scale ; the projection the coordinates'])
     end
-    it "should put a scale not given note if no scale is present" do
+    it 'should put a scale not given note if no scale is present' do
       values = mods_display_cartographics(@no_scale).fields
-      values.length.should == 1
-      values.first.values.should == ["Scale not given ; the projection the coordinates"]
+      expect(values.length).to eq(1)
+      expect(values.first.values).to eq(['Scale not given ; the projection the coordinates'])
     end
-    it "should handle when there is only a scale note" do
+    it 'should handle when there is only a scale note' do
       values = mods_display_cartographics(@scale_only).fields
-      values.length.should == 1
-      values.first.values.should == ["The scale"]
+      expect(values.length).to eq(1)
+      expect(values.first.values).to eq(['The scale'])
     end
-    it "should handle when only one post-scale piece of the data is available" do
+    it 'should handle when only one post-scale piece of the data is available' do
       values = mods_display_cartographics(@coordinates).fields
-      values.length.should == 1
-      values.first.values.should == ["Scale not given ; the coordinates"]
+      expect(values.length).to eq(1)
+      expect(values.first.values).to eq(['Scale not given ; the coordinates'])
     end
   end
-
-end
+end

data/spec/fields/collection_spec.rb

@@ -1,31 +1,77 @@
-require "spec_helper"
+require 'spec_helper'
 
 def mods_display_collection(mods_record)
-  ModsDisplay::Collection.new(mods_record, ModsDisplay::Configuration::Base.new, double("controller"))
+  ModsDisplay::Collection.new(
+    mods_record,
+    ModsDisplay::Configuration::Base.new,
+    double('controller')
+  )
 end
 
 describe ModsDisplay::Collection do
-  before(:all) do
-    @collection = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo><title>The Collection</title></titleInfo><typeOfResource collection='yes' /></relatedItem></mods>", false).related_item
-    @non_collection = Stanford::Mods::Record.new.from_str("<mods><relatedItem><titleInfo><title>Not a Collection</title></titleInfo></relatedItem></mods>", false).related_item
-    @display_label = Stanford::Mods::Record.new.from_str("<mods><relatedItem displayLabel='Special Collection'><titleInfo><title>Not a Collection</title></titleInfo></relatedItem></mods>", false).related_item
+  let(:collection) do
+    Stanford::Mods::Record.new.from_str(
+      '<mods>
+        <relatedItem>
+          <titleInfo><title>The Collection</title></titleInfo><typeOfResource collection="yes" />
+        </relatedItem>
+      </mods>',
+      false
+    ).related_item
   end
-  describe "label" do
-    it "should default to Collection" do
-      mods_display_collection(@collection).label.should == "Collection:"
+  let(:non_collection) do
+    Stanford::Mods::Record.new.from_str(
+      '<mods><relatedItem><titleInfo><title>Not a Collection</title></titleInfo></relatedItem></mods>',
+      false
+    ).related_item
+  end
+  let(:display_label) do
+    Stanford::Mods::Record.new.from_str(
+      '<mods>
+         <relatedItem displayLabel="Special Collection">
+           <titleInfo><title>Not a Collection</title></titleInfo>
+         </relatedItem>
+       </mods>',
+      false
+    ).related_item
+  end
+  let(:multiple_related_items) do
+    Stanford::Mods::Record.new.from_str(
+      '<mods>
+        <relatedItem displayLabel="Special Collection">
+          <titleInfo><title>Not a Collection</title></titleInfo>
+        </relatedItem>
+        <relatedItem>
+          <titleInfo><title>The Collection</title></titleInfo><typeOfResource collection="yes" />
+        </relatedItem>
+      </mods>',
+      false
+    ).related_item
+  end
+
+  describe 'label' do
+    it 'should default to Collection' do
+      expect(mods_display_collection(collection).fields.first.label).to eq('Collection:')
+    end
+
+    it 'should get the displayLabel if available' do
+      expect(mods_display_collection(display_label).label).to eq('Special Collection:')
     end
-    it "should get the displayLabel if available" do
-      mods_display_collection(@display_label).label.should == "Special Collection:"
+
+    it 'should get the proper titles of all items when there is a displayLabel present' do
+      expect(mods_display_collection(multiple_related_items).fields.first.label).to eq 'Collection:'
     end
   end
-  describe "fields" do
-    it "should get a collection title if there is an appropriate typeOfResource field with the collection attribute" do
-      fields = mods_display_collection(@collection).fields
-      fields.length.should == 1
-      fields.first.values.should == ["The Collection"]
+
+  describe 'fields' do
+    it 'should get a collection title if there is an appropriate typeOfResource field with the collection attribute' do
+      fields = mods_display_collection(collection).fields
+      expect(fields.length).to eq(1)
+      expect(fields.first.values).to eq(['The Collection'])
     end
-    it "should not return anything if the there is not an appropriate typeOfResource field with the collection attribute" do
-      mods_display_collection(@non_collection).fields.should == []
+
+    it 'should be blank if the there is not an appropriate typeOfResource field with the collection attribute' do
+      expect(mods_display_collection(non_collection).fields).to eq([])
     end
   end
-end
+end