Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/models/user_canonical_email_spec.rb b/spec/models/user_canonical_email_spec.rb
new file mode 100644
index 00000000000..54a4e968033
--- /dev/null
+++ b/spec/models/user_canonical_email_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe UserCanonicalEmail do
+  it { is_expected.to belong_to(:user) }
+
+  describe 'validations' do
+    describe 'canonical_email' do
+      it { is_expected.to validate_presence_of(:canonical_email) }
+
+      it 'validates email address', :aggregate_failures do
+        expect(build(:user_canonical_email, canonical_email: 'nonsense')).not_to be_valid
+        expect(build(:user_canonical_email, canonical_email: '@nonsense')).not_to be_valid
+        expect(build(:user_canonical_email, canonical_email: '@nonsense@')).not_to be_valid
+        expect(build(:user_canonical_email, canonical_email: 'nonsense@')).not_to be_valid
+      end
+    end
+  end
+end