Merge pull request #2874 from evazion/fix-tests

Fix various failing tests

app/models/note.rb

@@ -148,6 +148,7 @@ class Note < ActiveRecord::Base
 
   def create_version
     User.where(id: CurrentUser.id).update_all("note_update_count = note_update_count + 1")
+    CurrentUser.reload
 
     if merge_version?
       merge_version

app/models/post.rb

@@ -1437,6 +1437,8 @@ class Post < ActiveRecord::Base
 
     def create_new_version
       User.where(id: CurrentUser.id).update_all("post_update_count = post_update_count + 1")
+      CurrentUser.reload
+
       versions.create(
         :rating => rating,
         :source => source,