From 627d97155f63ff59cd1833b6abb0bc24fe6479c4 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 24 Oct 2019 19:59:18 +1300 Subject: [PATCH] Tidy up --- app/views/plantings/_timeline.html.haml | 6 ++++-- spec/features/plantings/planting_a_crop_spec.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/plantings/_timeline.html.haml b/app/views/plantings/_timeline.html.haml index 2ea0bdabf..3ea636832 100644 --- a/app/views/plantings/_timeline.html.haml +++ b/app/views/plantings/_timeline.html.haml @@ -16,6 +16,8 @@ %ul.list-unstyled.d-flex.justify-content-between - (@planting.expected_lifespan / 7).times do |week_number| %li{class: @planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted progress-fade' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(@planting.planted_at + week_number.weeks)} - = render 'timeline_icon', planting: @planting, - week_number: week_number, date_this_week: @planting.planted_at + week_number.weeks + = render 'timeline_icon', + planting: @planting, + week_number: week_number, + date_this_week: @planting.planted_at + week_number.weeks (One emojii = 1 week) diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb index b6eb4fe76..cd6fb2b3a 100644 --- a/spec/features/plantings/planting_a_crop_spec.rb +++ b/spec/features/plantings/planting_a_crop_spec.rb @@ -116,7 +116,7 @@ describe "Planting a crop", :js, :elasticsearch do expect(page).to have_content "planting was successfully created" expect(page).not_to have_content "0%" - expect(page).not_to have_content "Finished" + expect(page).not_to have_content "Finish expected" expect(page).not_to have_content "Finishes" end