From 3765a7e89e905c0f8b24c44b426b19db11a0f034 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sun, 23 Feb 2025 06:38:43 +0300 Subject: [PATCH] Refactor api changeset comment visibility json tests --- .../visibilities_controller_test.rb | 47 ++++++------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/test/controllers/api/changeset_comments/visibilities_controller_test.rb b/test/controllers/api/changeset_comments/visibilities_controller_test.rb index e5a9dbd83..b842af56a 100644 --- a/test/controllers/api/changeset_comments/visibilities_controller_test.rb +++ b/test/controllers/api/changeset_comments/visibilities_controller_test.rb @@ -93,14 +93,7 @@ module Api post api_changeset_comment_visibility_path(comment, :format => "json"), :headers => auth_header - assert_response :success - assert_equal "application/json", response.media_type - js = ActiveSupport::JSON.decode(@response.body) - assert_not_nil js["changeset"] - assert_equal comment.changeset_id, js["changeset"]["id"] - assert_equal 1, js["changeset"]["comments_count"] - - assert comment.reload.visible + check_successful_response_json(comment, :comment_visible => true) end def test_create_with_write_api_scope @@ -118,14 +111,7 @@ module Api post api_changeset_comment_visibility_path(comment, :format => "json"), :headers => auth_header - assert_response :success - js = ActiveSupport::JSON.decode(@response.body) - assert_equal "application/json", response.media_type - assert_not_nil js["changeset"] - assert_equal comment.changeset_id, js["changeset"]["id"] - assert_equal 1, js["changeset"]["comments_count"] - - assert comment.reload.visible + check_successful_response_json(comment, :comment_visible => true) end def test_destroy_by_unauthorized @@ -180,14 +166,7 @@ module Api delete api_changeset_comment_visibility_path(comment, :format => "json"), :headers => auth_header - assert_response :success - assert_equal "application/json", response.media_type - js = ActiveSupport::JSON.decode(@response.body) - assert_not_nil js["changeset"] - assert_equal comment.changeset_id, js["changeset"]["id"] - assert_equal 0, js["changeset"]["comments_count"] - - assert_not comment.reload.visible + check_successful_response_json(comment, :comment_visible => false) end def test_destroy_with_write_api_scope @@ -205,14 +184,7 @@ module Api delete api_changeset_comment_visibility_path(comment, :format => "json"), :headers => auth_header - assert_response :success - assert_equal "application/json", response.media_type - js = ActiveSupport::JSON.decode(@response.body) - assert_not_nil js["changeset"] - assert_equal comment.changeset_id, js["changeset"]["id"] - assert_equal 0, js["changeset"]["comments_count"] - - assert_not comment.reload.visible + check_successful_response_json(comment, :comment_visible => false) end private @@ -229,6 +201,17 @@ module Api assert_equal comment_visible, comment.reload.visible end + + def check_successful_response_json(comment, comment_visible:) + assert_response :success + assert_equal "application/json", response.media_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js["changeset"] + assert_equal comment.changeset_id, js["changeset"]["id"] + assert_equal comment_visible ? 1 : 0, js["changeset"]["comments_count"] + + assert_equal comment_visible, comment.reload.visible + end end end end -- 2.39.5