diff --git a/test/system/post_test.rb b/test/system/post_test.rb
index 73aa0cda8459c300b8741f17ade77111ae128b0e..7a2199fe69f31f7eedce8d795e4f1ee54e2ca592 100644
--- a/test/system/post_test.rb
+++ b/test/system/post_test.rb
@@ -107,7 +107,7 @@ class PostTest < ApplicationSystemTestCase
   # Show
   # -------------------------------------------------------
 
-  test 'User can view post' do
+  test 'Anyone can view question' do
     post = posts(:question_one)
     visit post_url(post)
 
@@ -122,7 +122,7 @@ class PostTest < ApplicationSystemTestCase
     end
   end
 
-  test 'User can sort answers' do
+  test 'Anyone can sort answers' do
     post = posts(:question_one)
     visit post_url(post)
 
@@ -130,4 +130,28 @@ class PostTest < ApplicationSystemTestCase
 
     assert_current_path post_url(post, sort: 'active')
   end
+
+  # -------------------------------------------------------
+  # Edit
+  # -------------------------------------------------------
+
+  test 'User with edit permissions can directly edit question' do
+    log_in :editor
+    post = posts(:question_two)
+    visit post_url(post)
+
+    within ".post[data-post-id=\"#{post.id}\"]" do
+      click_on 'Edit'
+    end
+
+    updated_text = 'This is the updated body text, which should be quite different from the original text!'
+    fill_in 'Body', with: updated_text
+    fill_in 'Edit Comment', with: 'Major Rewrite for Tests'
+
+    click_on "Save Post in #{post.category.name}"
+    assert_current_path post_url(post)
+
+    # Check that the page shows the updated text
+    assert_text updated_text
+  end
 end