diff --git a/app/resources/numismatics/people/numismatics/person_decorator.rb b/app/resources/numismatics/people/numismatics/person_decorator.rb index fb5fe73fa2..1dceefc27a 100644 --- a/app/resources/numismatics/people/numismatics/person_decorator.rb +++ b/app/resources/numismatics/people/numismatics/person_decorator.rb @@ -30,8 +30,8 @@ def title private def date_range - return "(#{born&.first} - #{died&.first})" unless born.blank? && died.blank? - return "(#{years_active_start&.first} - #{years_active_end&.first})" unless years_active_start.blank? && years_active_end.blank? + return "(#{born&.first} to #{died&.first})" unless born.blank? && died.blank? + return "(#{years_active_start&.first} to #{years_active_end&.first})" unless years_active_start.blank? && years_active_end.blank? end end end diff --git a/spec/resources/numismatics/coins/numismatics/coin_decorator_spec.rb b/spec/resources/numismatics/coins/numismatics/coin_decorator_spec.rb index dc5331d1f6..d3e577ac44 100644 --- a/spec/resources/numismatics/coins/numismatics/coin_decorator_spec.rb +++ b/spec/resources/numismatics/coins/numismatics/coin_decorator_spec.rb @@ -89,7 +89,7 @@ issue end it "returns a pub_created_display" do - expect(decorator.pub_created_display).to eq("name1 name2 epithet (1868 - 1963), 1/2 Penny") + expect(decorator.pub_created_display).to eq("name1 name2 epithet (1868 to 1963), 1/2 Penny") end end context "when the coin is not attached to a numismatic issue" do diff --git a/spec/resources/numismatics/issues/numismatics/issues_feature_spec.rb b/spec/resources/numismatics/issues/numismatics/issues_feature_spec.rb index 24528d0b8a..c3f11ec8a5 100644 --- a/spec/resources/numismatics/issues/numismatics/issues_feature_spec.rb +++ b/spec/resources/numismatics/issues/numismatics/issues_feature_spec.rb @@ -205,7 +205,7 @@ expect(page).to have_css ".attribute.denomination", text: "test value" expect(page).to have_css ".attribute.edge", text: "test value" expect(page).to have_css ".attribute.era", text: "test value" - expect(page).to have_css ".attribute.master", text: "name1 name2 epithet (1868 - 1963)" + expect(page).to have_css ".attribute.master", text: "name1 name2 epithet (1868 to 1963)" expect(page).to have_css ".attribute.metal", text: "test value" expect(page).to have_css ".attribute.notes", text: "note" expect(page).to have_css ".attribute.object_date", text: "test value" @@ -228,7 +228,7 @@ expect(page).to have_css ".attribute.reverse_orientation", text: "test value" expect(page).to have_css ".attribute.reverse_part", text: "test value" expect(page).to have_css ".attribute.reverse_symbol", text: "test value" - expect(page).to have_css ".attribute.rulers", text: "name1 name2 epithet (1868 - 1963)" + expect(page).to have_css ".attribute.rulers", text: "name1 name2 epithet (1868 to 1963)" expect(page).to have_css ".attribute.series", text: "test value" expect(page).to have_css ".attribute.shape", text: "test value" expect(page).to have_css ".attribute.subjects", text: "Animal, unicorn" diff --git a/spec/resources/numismatics/people/numismatics/person_decorator_spec.rb b/spec/resources/numismatics/people/numismatics/person_decorator_spec.rb index 961efe4132..dee3154e0c 100644 --- a/spec/resources/numismatics/people/numismatics/person_decorator_spec.rb +++ b/spec/resources/numismatics/people/numismatics/person_decorator_spec.rb @@ -16,7 +16,7 @@ describe "#title" do context "with a born and died date" do it "generates a title" do - expect(decorator.title).to eq("name1 name2 epithet (1868 - 1963)") + expect(decorator.title).to eq("name1 name2 epithet (1868 to 1963)") end end @@ -30,7 +30,7 @@ end it "generates a title" do - expect(decorator.title).to eq("name1 name2 epithet ( - 1963)") + expect(decorator.title).to eq("name1 name2 epithet ( to 1963)") end end @@ -44,7 +44,7 @@ end it "generates a title" do - expect(decorator.title).to eq("name1 name2 epithet (1894 - )") + expect(decorator.title).to eq("name1 name2 epithet (1894 to )") end end end diff --git a/spec/services/orangelight_document_spec.rb b/spec/services/orangelight_document_spec.rb index d882b7a620..b5b994e0e6 100644 --- a/spec/services/orangelight_document_spec.rb +++ b/spec/services/orangelight_document_spec.rb @@ -94,7 +94,7 @@ holding = JSON.parse(output[:holdings_1display]).first.last expect(output[:id]).to eq coin.decorate.orangelight_id expect(output[:title_display]).to eq "Coin: #{coin.coin_number}" - expect(output[:pub_created_display]).to eq "name1 name2 epithet (1868 - 1963), 1/2 Penny, city" + expect(output[:pub_created_display]).to eq "name1 name2 epithet (1868 to 1963), 1/2 Penny, city" expect(output[:call_number_display]).to eq ["Coin #{coin.coin_number}"] expect(output[:call_number_browse_s]).to eq ["Coin #{coin.coin_number}"] expect(output[:access_facet]).to eq ["Online", "In the Library"] @@ -134,9 +134,9 @@ expect(output[:issue_color_s]).to eq ["green"] expect(output[:issue_edge_s]).to eq ["GOTT MIT UNS"] expect(output[:issue_era_s]).to eq ["uncertain"] - expect(output[:issue_ruler_s]).to eq ["name1 name2 epithet (1868 - 1963)"] - expect(output[:issue_ruler_sort]).to eq "name1 name2 epithet (1868 - 1963)" - expect(output[:issue_master_s]).to eq ["name1 name2 epithet (1868 - 1963)"] + expect(output[:issue_ruler_s]).to eq ["name1 name2 epithet (1868 to 1963)"] + expect(output[:issue_ruler_sort]).to eq "name1 name2 epithet (1868 to 1963)" + expect(output[:issue_master_s]).to eq ["name1 name2 epithet (1868 to 1963)"] expect(output[:issue_workshop_s]).to eq ["Bristol"] expect(output[:issue_series_s]).to eq ["Hibernia"] expect(output[:issue_place_s]).to eq ["city, state, region"]