allow a verified secondary email to be use as the primary without

a reconfirmation

2 files changed, 13 insertions, 2 deletions

diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
index 8fca9db37ca..8ae5ccd89ed 100644
--- a/spec/models/email_spec.rb
+++ b/spec/models/email_spec.rb
@@ -24,8 +24,6 @@ describe Email do
       email = user.emails.create(email: 'new@email.com')
       expect(user).to receive(:update_invalid_gpg_signatures)
       email.confirm
-      # email.save
     end
   end
-
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a230f72449a..c6df8028072 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -359,6 +359,19 @@ describe User do
         expect(external_user.projects_limit).to be 0
       end
     end
+    
+    describe '#check_for_verified_email' do
+      let(:user)      { create(:user) }
+      let(:secondary) { create(:email, :confirmed, email: 'secondary@example.com', user: user, ) }
+      
+      it 'allows a verfied secondary email to be used as the primary without needing reconfirmation' do
+        user.update_attributes!(email: secondary.email)
+        user.reload
+        expect(user.email).to eq secondary.email
+        expect(user.unconfirmed_email).to eq nil
+        expect(user.confirmed?).to be_truthy
+      end
+    end
   end
 
   describe 'after update hook' do