summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-07 20:04:21 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-07 20:04:21 +0000
commitf9c6ff7508198e5664ca515b8ec8c1cffa3e8802 (patch)
tree0711fc32a4bb2874bc0b9a623d2ef0939d8c64c1 /spec/models
parent942bd5b4112d90c66d637ef350b881574de45065 (diff)
parentda5262f4e6d9524b2af2ad8f6c8ebe10edf17169 (diff)
downloadgitlab-ce-f9c6ff7508198e5664ca515b8ec8c1cffa3e8802.tar.gz
Merge branch 'backport-ee-2251' into 'master'
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/key_spec.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 0daeb337168..3508391c721 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -83,15 +83,6 @@ describe Key, :mailer do
expect(build(:key)).to be_valid
end
- it 'rejects an unfingerprintable key that contains a space' do
- key = build(:key)
-
- # Not always the middle, but close enough
- key.key = key.key[0..100] + ' ' + key.key[101..-1]
-
- expect(key).not_to be_valid
- end
-
it 'accepts a key with newline charecters after stripping them' do
key = build(:key)
key.key = key.key.insert(100, "\n")
@@ -102,7 +93,6 @@ describe Key, :mailer do
it 'rejects the unfingerprintable key (not a key)' do
expect(build(:key, key: 'ssh-rsa an-invalid-key==')).not_to be_valid
end
-
end
context 'callbacks' do