From 998dc0927b9bd0b38858c9044462913bf77434a9 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" Date: Mon, 18 Mar 2019 14:24:04 +0000 Subject: [PATCH 1/2] Update shoulda-matchers to version 4.0.1 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3dfea397..85a35337 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -524,8 +524,8 @@ GEM rubyzip (~> 1.2, >= 1.2.2) sexp_processor (4.11.0) shellany (0.0.1) - shoulda-matchers (3.1.2) - activesupport (>= 4.0.0) + shoulda-matchers (4.0.1) + activesupport (>= 4.2.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) From ca574ae2afa4f16b86cd958c336ceaec112eec6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Wed, 27 Mar 2019 10:19:01 +0100 Subject: [PATCH 2/2] Fix failing validation in Registration In the conference is not set, validation that the call for paper is accepted breaks. This made the conference association test failing. --- app/models/registration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/registration.rb b/app/models/registration.rb index f7c032ea..bc1fbd8a 100644 --- a/app/models/registration.rb +++ b/app/models/registration.rb @@ -31,7 +31,7 @@ class Registration < ApplicationRecord validate :registration_to_events_only_if_present validates :accepted_code_of_conduct, acceptance: { - if: -> { conference.code_of_conduct.present? } + if: -> { conference.try(:code_of_conduct).present? } } after_create :set_week, :subscribe_to_conference, :send_registration_mail