From e625ab1539880c323399bd3710ef88b4b5585154 Mon Sep 17 00:00:00 2001
From: Rodrigo Nardi <rnardi@netdef.org>
Date: Tue, 10 Sep 2024 09:08:14 -0300
Subject: [PATCH] RVM and Debian 12

Fixing unit test

Signed-off-by: Rodrigo Nardi <rnardi@netdef.org>
---
 app/github_app.rb           | 20 ++++++++++++--------
 spec/app/github_app_spec.rb |  3 ++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/github_app.rb b/app/github_app.rb
index beb6bbd..53b4a26 100755
--- a/app/github_app.rb
+++ b/app/github_app.rb
@@ -49,10 +49,11 @@ def sinatra_logger_level
   end
 
   post '/update/status' do
+    content_type :json
+
     logger = GithubLogger.instance.create('github_app.log', GithubApp.sinatra_logger_level)
 
-    @payload_raw = request.body.read
-    @payload = JSON.parse(@payload_raw)
+    @payload = JSON.parse(fetch_message)
 
     logger.debug "Received event UpdateStatus: #{@payload}"
 
@@ -73,7 +74,7 @@ def sinatra_logger_level
   post '/slack' do
     halt 401 unless slack_authentication
 
-    payload = JSON.parse(request.body.read)
+    payload = JSON.parse(fetch_message)
 
     logger.debug "Received Slack command: #{payload.inspect}"
     puts "Received Slack command: #{payload.inspect}"
@@ -90,7 +91,7 @@ def sinatra_logger_level
   post '/slack/settings' do
     halt 401 unless slack_authentication
 
-    payload = JSON.parse(request.body.read)
+    payload = fetch_message
 
     logger.debug "Received Slack command: #{payload.inspect}"
 
@@ -104,12 +105,10 @@ def sinatra_logger_level
 
     logger = GithubLogger.instance.create('github_app.log', GithubApp.sinatra_logger_level)
 
-    request.body.rewind
-    body = request.body.read
+    body = fetch_message
     log_header(logger, body)
 
-    @payload_raw = body
-    payload = JSON.parse(@payload_raw)
+    payload = JSON.parse(body)
 
     authenticate_request
 
@@ -181,6 +180,11 @@ def slack_authentication
     def basic_encode(account, password)
       "Basic #{["#{account}:#{password}"].pack('m0')}"
     end
+
+    def fetch_message
+      request.body.rewind
+      @payload_raw = request.body.read
+    end
   end
 
   # :nocov:
diff --git a/spec/app/github_app_spec.rb b/spec/app/github_app_spec.rb
index 9f45632..2e201ba 100644
--- a/spec/app/github_app_spec.rb
+++ b/spec/app/github_app_spec.rb
@@ -388,7 +388,8 @@
     context 'when fetch settings' do
       let(:headers) do
         {
-          'HTTP_AUTHORIZATION' => auth
+          'HTTP_AUTHORIZATION' => auth,
+          'HTTP_ACCEPT' => 'application/json'
         }
       end