Merge pull request #1162 from eip-ewi/fix-post-locked

Author: ArtOfCode-

app/models/post.rb

@@ -175,6 +175,8 @@ def locked?
     if locked
       update(locked: false, locked_by: nil, locked_at: nil, locked_until: nil)
     end
+
+    false
   end
 
   # @param user [User, Nil]

test/controllers/posts/lock_test.rb

@@ -79,4 +79,15 @@ class PostsControllerTest < ActionController::TestCase
     end
     assert_equal 'success', JSON.parse(response.body)['status']
   end
+
+  test 'Locks on posts expire' do
+    sign_in users(:moderator)
+    post :lock, params: { id: posts(:question_one).id, length: 1, format: :json }
+    assert_response 200
+
+    # Change the locked_until to have already passed
+    assigns(:post).update(locked_until: 1.second.ago)
+
+    assert_not assigns(:post).locked?
+  end
 end

test/fixtures/posts.yml

@@ -150,7 +150,6 @@ locked:
   locked: true
   locked_by: deleter
   locked_at: 2019-01-01T00:00:00.000000Z
-  locked_until: 2020-01-01T00:00:00.000000Z
   user: standard_user
   community: sample
   category: main
@@ -175,7 +174,6 @@ locked_mod:
   locked: true
   locked_by: moderator
   locked_at: 2019-01-01T00:00:00.000000Z
-  locked_until: 2020-01-01T00:00:00.000000Z
   user: standard_user
   community: sample
   category: main