Skip to content

Commit 892a165

Browse files
committed
dont set default avatar in test env
1 parent 20d6490 commit 892a165

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

app/models/user.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class User < ActiveRecord::Base
7575

7676
after_update :maybe_send_update_notification
7777

78-
before_save :set_default_avatar
78+
before_save :set_default_avatar, unless: -> { ::Rails.env.test? }
7979

8080
def login=(login)
8181
@login = login
@@ -149,8 +149,14 @@ def maybe_send_update_notification
149149

150150
def set_default_avatar
151151
unless self.image.present?
152-
random_avatar = File.new ::Rails.root.join("config/default_avatars/default_avatar_#{rand(1..5)}.png")
153-
self.image = random_avatar
152+
# TODO use in test when we switch to active storage
153+
if ::Rails.env === "test"
154+
random_avatar = File.new ::Rails.root.join("config/default_avatars/default_avatar_1.png")
155+
self.image = random_avatar
156+
else
157+
random_avatar = File.new ::Rails.root.join("config/default_avatars/default_avatar_#{rand(1..5)}.png")
158+
self.image = random_avatar
159+
end
154160
end
155161
end
156162
end

0 commit comments

Comments
 (0)