From a38391a6bc20bab5be49236db7ee38bd5fe22a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 23 Nov 2017 16:54:40 +0100 Subject: [PATCH] FIX: ensure discobot always has a primary email --- .../db/fixtures/001_discobot.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb index ebc2299937f..4ee2a6b30b1 100644 --- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb +++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb @@ -1,15 +1,16 @@ discobot_username = 'discobot' -user = User.find_by(id: -2) - -if !user - suggested_username = UserNameSuggester.suggest(discobot_username) +def seed_primary_email UserEmail.seed do |ue| ue.id = -2 ue.email = "discobot_email" ue.primary = true ue.user_id = -2 end +end + +unless user = User.find_by(id: -2) + suggested_username = UserNameSuggester.suggest(discobot_username) User.seed do |u| u.id = -2 @@ -37,6 +38,13 @@ if !user end bot = User.find(-2) + +# ensure discobot has a primary email +unless bot.primary_email + seed_primary_email + bot.reload +end + bot.update!(admin: true, moderator: false) bot.user_option.update!(