Merge branch 'dev' into crops-show

This commit is contained in:
Brenda Wallace
2019-02-11 08:17:44 +13:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -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 }

View File

@@ -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