Merge branch 'dev' into crops-show

spec/helpers/buttons_helper_spec.rb

@@ -11,7 +11,7 @@ require 'rails_helper'
 #   end
 # end
 RSpec.describe ButtonsHelper, type: :helper do
-  before { allow(self).to receive(:can?) { true } }
+  before { allow(self).to receive(:can?).and_return(true) }
 
   let(:garden) { FactoryBot.create :garden }
   let(:planting) { FactoryBot.create :planting }

spec/views/crops/_planting_advice.html.haml_spec.rb

@@ -5,7 +5,7 @@ describe "crops/_planting_advice" do
 
   let(:planting) { FactoryBot.create(:planting) }
 
-  shared_examples "render planting_advice" do
+  shared_context "render planting_advice" do
     before { render 'crops/planting_advice', crop: planting.crop }
   end