Reuse `for_commit?` on conditional validations

2eeeb266 · Douglas Barbosa Alexandre · a5bad465 · 2eeeb266
Commit 2eeeb266 authored Mar 18, 2016 by Douglas Barbosa Alexandre
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/todo.rb app/models/todo.rb +2 -2

No files found.
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -29,8 +29,8 @@ class Todo < ActiveRecord::Base
  delegate :name, :email, to: :author, prefix: true, allow_nil: true

  validates :action, :project, :target_type, :user, presence: true
-  validates :target_id, presence: true, if: ->(t) { t.target_type.present? && t.target_type != 'Commit' }
-  validates :commit_id, presence: true, if: ->(t) { t.target_type.present? && t.target_type == 'Commit' }
+  validates :target_id, presence: true, unless: :for_commit?
+  validates :commit_id, presence: true, if: :for_commit?

  default_scope { reorder(id: :desc) }