From 13ed098172e6abcfb8af840caf186b2ad186b74f Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Wed, 27 Aug 2025 14:09:55 +0000 Subject: [PATCH 1/4] Remove openfarm links (defunct) --- app/views/crops/show.html.haml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml index 9084bdbef..202a9bb89 100644 --- a/app/views/crops/show.html.haml +++ b/app/views/crops/show.html.haml @@ -124,13 +124,6 @@ = icon 'fas', 'external-link-alt' Wikipedia (English) - %li.list-group-item - = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-')}", - class: 'card-link', - target: "_blank", - rel: "noopener noreferrer" do - = icon 'fas', 'external-link-alt' - OpenFarm - Growing guide %li.list-group-item = link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}", target: "_blank", From fadf5154e44f040c8e14f97be0502b30bae5b11a Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Wed, 27 Aug 2025 14:11:01 +0000 Subject: [PATCH 2/4] Remove openfarm links (defunct) --- app/models/concerns/open_farm_data.rb | 4 ---- app/views/crops/_planting_advice.html.haml | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/models/concerns/open_farm_data.rb b/app/models/concerns/open_farm_data.rb index f051d43ce..e893d5c18 100644 --- a/app/models/concerns/open_farm_data.rb +++ b/app/models/concerns/open_farm_data.rb @@ -43,10 +43,6 @@ module OpenFarmData fetch_attr('common_names') end - def guides_count - fetch_attr('guides_count') - end - def binomial_name fetch_attr('binomial_name') end diff --git a/app/views/crops/_planting_advice.html.haml b/app/views/crops/_planting_advice.html.haml index a554a7058..139597f9c 100644 --- a/app/views/crops/_planting_advice.html.haml +++ b/app/views/crops/_planting_advice.html.haml @@ -1,6 +1,2 @@ -- if crop.guides_count.present? && crop.guides_count.positive? - %p - There are - = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-').downcase}" do - #{crop.guides_count} growing guides on Open Farm + From e7090631ab547e184a64d821eb221a98e5758778 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Wed, 27 Aug 2025 14:12:13 +0000 Subject: [PATCH 3/4] Remove partial --- app/views/crops/_planting_advice.html.haml | 2 -- app/views/crops/show.html.haml | 1 - 2 files changed, 3 deletions(-) delete mode 100644 app/views/crops/_planting_advice.html.haml diff --git a/app/views/crops/_planting_advice.html.haml b/app/views/crops/_planting_advice.html.haml deleted file mode 100644 index 139597f9c..000000000 --- a/app/views/crops/_planting_advice.html.haml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml index 202a9bb89..195ee2e3f 100644 --- a/app/views/crops/show.html.haml +++ b/app/views/crops/show.html.haml @@ -74,7 +74,6 @@ .card-body %h4 How to grow #{@crop.name.pluralize} = render 'grown_for', crop: @crop - = render 'planting_advice', crop: @crop - if @crop.parent %hr/ %p.parent-crop From ab29de3d046f17b534f995b280b07e5c6cf33048 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Wed, 27 Aug 2025 14:45:57 +0000 Subject: [PATCH 4/4] Remove dead test --- spec/features/crops/crop_detail_page_spec.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb index 96020dca7..cc566d2ac 100644 --- a/spec/features/crops/crop_detail_page_spec.rb +++ b/spec/features/crops/crop_detail_page_spec.rb @@ -76,10 +76,6 @@ describe "crop detail page", :js do expect(page).to have_link "Wikipedia (English)", href: crop.en_wikipedia_url end - it "has a link to OpenFarm" do - expect(page).to have_link "OpenFarm - Growing guide" - end - it "has a link to gardenate" do expect(page).to have_link "Gardenate - Planting reminders", href: "https://www.gardenate.com/plant/#{CGI.escape crop.name}" @@ -144,7 +140,7 @@ describe "crop detail page", :js do let(:crop) { FactoryBot.create(:annual_crop) } describe 'with harvests' do - include_examples "predicts harvest" + it_behaves_like "predicts harvest" end it "predicts lifespan" do @@ -165,7 +161,7 @@ describe "crop detail page", :js do end describe 'with harvests' do - include_examples "predicts harvest" + it_behaves_like "predicts harvest" end it "describes Perennial crops" do @@ -181,7 +177,7 @@ describe "crop detail page", :js do end describe 'with harvests' do - include_examples "predicts harvest" + it_behaves_like "predicts harvest" end end end