jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix CurrentUser issue with tests

Browse Source 
For some tests, the current user wasn't set by the time the CurrentUser
variable was used in several of the models.
This commit is contained in:
BrokenEagle
2020-07-19 03:58:02 +00:00
parent b2a2c4e140
commit e34e7b0d90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/post_vote.rb
View File

@@ -25,7 +25,7 @@ class PostVote < ApplicationRecord
end end
def initialize_attributes def initialize_attributes
self.user_id ||= CurrentUser.user.id self.user_id ||= CurrentUser.id
if vote == "up" if vote == "up"
self.score = 1 self.score = 1

4
app/models/wiki_page.rb
View File

@@ -189,12 +189,12 @@ class WikiPage < ApplicationRecord
def merge_version? def merge_version?
prev = versions.last prev = versions.last
prev && prev.updater_id == CurrentUser.user.id && prev.updated_at > 1.hour.ago prev && prev.updater_id == CurrentUser.id && prev.updated_at > 1.hour.ago
end end
def create_new_version def create_new_version
versions.create( versions.create(
:updater_id => CurrentUser.user.id, :updater_id => CurrentUser.id,
:updater_ip_addr => CurrentUser.ip_addr, :updater_ip_addr => CurrentUser.ip_addr,
:title => title, :title => title,
:body => body, :body => body,