From 6c68d30a76f7e298844cc43b93d7213485100dee Mon Sep 17 00:00:00 2001 From: mtribone Date: Wed, 24 Aug 2016 10:35:36 -0400 Subject: [PATCH] Updates label for based near on the work show page. Adds source to show view. Tests for the presence of source field and that based near is labeled location. Adds translation to labels for contributor and based near. --- .../curation_concerns/base/_attribute_rows.html.erb | 3 ++- config/locales/sufia.en.yml | 2 ++ spec/features/work_show_spec.rb | 10 ++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/curation_concerns/base/_attribute_rows.html.erb b/app/views/curation_concerns/base/_attribute_rows.html.erb index 3bb17c6eef..76da0af608 100644 --- a/app/views/curation_concerns/base/_attribute_rows.html.erb +++ b/app/views/curation_concerns/base/_attribute_rows.html.erb @@ -1,5 +1,5 @@ <%= presenter.attribute_to_html(:creator, render_as: :faceted) %> -<%= presenter.attribute_to_html(:contributor, label: 'Contributors', render_as: :faceted) %> +<%= presenter.attribute_to_html(:contributor, render_as: :faceted) %> <%= presenter.attribute_to_html(:admin_set, render_as: :faceted) %> <%= presenter.attribute_to_html(:subject, render_as: :faceted) %> <%= presenter.attribute_to_html(:publisher, render_as: :faceted) %> @@ -10,3 +10,4 @@ <%= presenter.attribute_to_html(:based_near, render_as: :faceted) %> <%= presenter.attribute_to_html(:related_url) %> <%= presenter.attribute_to_html(:resource_type, render_as: :faceted) %> +<%= presenter.attribute_to_html(:source) %> diff --git a/config/locales/sufia.en.yml b/config/locales/sufia.en.yml index 82af7d9612..1b13cf81f1 100644 --- a/config/locales/sufia.en.yml +++ b/config/locales/sufia.en.yml @@ -400,6 +400,8 @@ en: search: fields: show: + based_near: Location + contributor: Contributors keyword: Keyword diff --git a/spec/features/work_show_spec.rb b/spec/features/work_show_spec.rb index 3752718917..9142fc2760 100644 --- a/spec/features/work_show_spec.rb +++ b/spec/features/work_show_spec.rb @@ -2,7 +2,7 @@ let(:work_path) { "/concern/generic_works/#{work.id}" } context "as the work owner" do - let(:work) { create(:work_with_one_file, title: ["Magnificent splendor"], user: user) } + let(:work) { create(:work_with_one_file, title: ["Magnificent splendor"], source: ["The Internet"], based_near: ["USA"], user: user) } let(:user) { create(:user) } before do sign_in user @@ -11,6 +11,9 @@ it "shows a work" do expect(page).to have_selector 'h1', text: 'Magnificent splendor' + expect(page).to have_selector 'li', text: 'The Internet' + expect(page).to have_selector 'th', text: 'Location' + expect(page).not_to have_selector 'th', text: 'Based near' # Displays FileSets already attached to this work within '.related-files' do @@ -20,13 +23,16 @@ end context "as a user who is not logged in" do - let(:work) { create(:public_generic_work, title: ["Magnificent splendor"]) } + let(:work) { create(:public_generic_work, title: ["Magnificent splendor"], source: ["The Internet"], based_near: ["USA"]) } before do visit work_path end it "shows a work" do expect(page).to have_selector 'h1', text: 'Magnificent splendor' + expect(page).to have_selector 'li', text: 'The Internet' + expect(page).to have_selector 'th', text: 'Location' + expect(page).not_to have_selector 'th', text: 'Based near' # Doesn't have the upload form for uploading more files expect(page).not_to have_selector "form#fileupload"