From 95db0f72973cedbef3bdba9c963e1a2d7f62d673 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 9 Feb 2019 14:18:15 +1300 Subject: [PATCH] Shortened the text on the badges --- config/locales/en.yml | 4 ++-- spec/features/gardens/gardens_index_spec.rb | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 52eca5f35..a1924458c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -191,8 +191,8 @@ en: number_gardens_linktext: "%{count} gardens" number_plantings_linktext: "%{count} times" label: - days_until_harvest: "%{number} days until harvest" - days_until_finished: "%{number} days until finished" + days_until_harvest: "%{number} days" + days_until_finished: "%{number} days" harvesting_now: harvesting now layouts: header: diff --git a/spec/features/gardens/gardens_index_spec.rb b/spec/features/gardens/gardens_index_spec.rb index fa047d8d8..800c045e8 100644 --- a/spec/features/gardens/gardens_index_spec.rb +++ b/spec/features/gardens/gardens_index_spec.rb @@ -104,8 +104,8 @@ feature "Gardens#index", :js do it { expect(page).to have_link href: planting_path(planting) } it { expect(page).to have_link href: garden_path(planting.garden) } - it { expect(page).to have_text '50 days until harvest' } - it { expect(page).to have_text '90 days until finished' } + it { expect(page).to have_text '50 days' } + it { expect(page).to have_text '90 days' } it { expect(page).not_to have_text 'harvesting now' } end @@ -121,8 +121,8 @@ feature "Gardens#index", :js do it { expect(crop.median_lifespan).to eq 90 } it { expect(page).to have_text 'harvesting now' } - it { expect(page).to have_text '39 days until finished' } - it { expect(page).not_to have_text 'days until harvest' } + it { expect(page).to have_text '39 days' } + it { expect(page).not_to have_text 'Predicted days until harvest' } end describe 'super late' do @@ -134,8 +134,8 @@ feature "Gardens#index", :js do it { expect(page).to have_text 'super late' } it { expect(page).not_to have_text 'harvesting now' } - it { expect(page).not_to have_text 'days until harvest' } - it { expect(page).not_to have_text 'days until finished' } + it { expect(page).not_to have_text 'Predicted days until harvest' } + it { expect(page).not_to have_text 'Predicted days until planting is finished' } end end end