Merge branch 'master' into merge-notifsmerge-notifs

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 76f16323e2f..876cfb1204a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -57,6 +57,7 @@
 #  otp_backup_codes              :text
 #  public_email                  :string(255)      default(""), not null
 #  dashboard                     :integer          default(0)
+#  project_view                  :integer          default(0)
 #
 
 require 'spec_helper'
@@ -183,6 +184,19 @@ describe User do
     it { is_expected.to respond_to(:private_token) }
   end
 
+  describe '#confirm' do
+    let(:user) { create(:user, confirmed_at: nil, unconfirmed_email: 'test@gitlab.com') }
+
+    it 'returns unconfirmed' do
+      expect(user.confirmed?).to be_falsey
+    end
+
+    it 'confirms a user' do
+      user.confirm!
+      expect(user.confirmed?).to be_truthy
+    end
+  end
+
   describe '#to_reference' do
     let(:user) { create(:user) }