summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-07-05 14:03:36 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:43:37 +0200
commite79e2ae1f4b671488b31428f7a6506a245a7bddc (patch)
treeecf76d0362f49611a4de5b57dd7afe9f59f7aae9
parentd9fd3709abb7897785ac111c217b532663313abd (diff)
downloadgitlab-ce-e79e2ae1f4b671488b31428f7a6506a245a7bddc.tar.gz
validate presence of user on gpg_key
-rw-r--r--app/models/gpg_key.rb2
-rw-r--r--spec/models/gpg_key_spec.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb
index 8cfccef0854..612d954b1c5 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -6,6 +6,8 @@ class GpgKey < ActiveRecord::Base
belongs_to :user
has_many :gpg_signatures, dependent: :nullify
+ validates :user, presence: true
+
validates :key,
presence: true,
uniqueness: true,
diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb
index 88b5eb79b59..ffbf8760e86 100644
--- a/spec/models/gpg_key_spec.rb
+++ b/spec/models/gpg_key_spec.rb
@@ -6,6 +6,7 @@ describe GpgKey do
end
describe "validation" do
+ it { is_expected.to validate_presence_of(:user) }
it { is_expected.to validate_presence_of(:key) }
it { is_expected.to validate_uniqueness_of(:key) }
it { is_expected.to allow_value("-----BEGIN PGP PUBLIC KEY BLOCK-----\nkey").for(:key) }