Commit 86e098ac authored by Douwe Maan's avatar Douwe Maan

Don't have factories trip a validation

parent 8eef877c
......@@ -2,8 +2,8 @@ module ProtectedBranchAccess
extend ActiveSupport::Concern
included do
validates_uniqueness_of :user_id, scope: :protected_branch, allow_nil: true
validates_uniqueness_of :access_level, scope: :protected_branch, unless: :user_id?, conditions: -> { where(user_id: nil) }
validates :user_id, uniqueness: { scope: :protected_branch, allow_nil: true }
validates :access_level, uniqueness: { scope: :protected_branch, unless: :user_id?, conditions: -> { where(user_id: nil) } }
end
def type
......
......@@ -2,6 +2,6 @@ FactoryGirl.define do
factory :protected_branch_merge_access_level, class: ProtectedBranch::MergeAccessLevel do
user nil
protected_branch
access_level { Gitlab::Access::MASTER }
access_level { Gitlab::Access::DEVELOPER }
end
end
......@@ -2,6 +2,6 @@ FactoryGirl.define do
factory :protected_branch_push_access_level, class: ProtectedBranch::PushAccessLevel do
user nil
protected_branch
access_level { Gitlab::Access::MASTER }
access_level { Gitlab::Access::DEVELOPER }
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment