Fix specs. Remove unnecesary relation.

AyuntamientoMadrid · Dec 27, 2017 · eb0fb5f · eb0fb5f
1 parent 77c7b85
commit eb0fb5f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/app/models/event.rb b/app/models/event.rb
@@ -15,7 +15,7 @@ class Event < ActiveRecord::Base
   validates_inclusion_of :lobby_activity, :in => [true, false]
   validate :participants_uniqueness, :position_not_in_participants, :role_validate_scheduled, :validate_location
   validates :canceled_reasons, presence: { message: I18n.t('backend.lobby_not_allowed_neither_empty_mail') }, allow_blank: false, if: Proc.new { |a| !a.canceled_at.blank? }
-  validates :declined_reasons, presence: { message: I18n.t('backend.lobby_not_allowed_neither_empty_mail') }, allow_blank: false, if: Proc.new { |a| !a.declined_at.blank? || (a.current_user && !a.current_user.lobby?) }
+  validates :declined_reasons, presence: { message: I18n.t('backend.lobby_not_allowed_neither_empty_mail') }, allow_blank: false, if: Proc.new { |a| !a.declined_at.blank? && a.current_user.present? && !a.current_user.lobby? }
 
   before_create :set_status
   before_update :set_published_at

diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -15,7 +15,6 @@ class Organization < ActiveRecord::Base
   has_many :organization_registered_lobbies, dependent: :destroy
   has_many :registered_lobbies, through: :organization_registered_lobbies, dependent: :destroy
   has_many :attachments, dependent: :destroy
-  has_one :comunication_representant, dependent: :destroy
   has_one :user, dependent: :destroy
   has_one :legal_representant, dependent: :destroy
   belongs_to :category

diff --git a/...res/mailers/organizations_mailser_spec.rb → ...ures/mailers/organizations_mailer_spec.rb b/...res/mailers/organizations_mailser_spec.rb → ...ures/mailers/organizations_mailer_spec.rb