update to current master and fix conflictsissue-title-vue

1 files changed, 3 insertions, 1 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9da4140f3ce..90378179e32 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -699,7 +699,9 @@ describe User, models: true do
 
     let!(:user) { create(:user, name: 'John Doe', username: 'john.doe', email: 'john.doe@example.com' ) }
     let!(:another_user) { create(:user, name: 'Albert Smith', username: 'albert.smith', email: 'albert.smith@example.com' ) }
-    let!(:email) { create(:email, user: another_user) }
+    let!(:email) do
+      create(:email, user: another_user, email: 'alias@example.com')
+    end
 
     it 'returns users with a matching name' do
       expect(search_with_secondary_emails(user.name)).to eq([user])