From dbd76e931673e165488bfa7a42d02ef07bf844b0 Mon Sep 17 00:00:00 2001
From: Sebastian Serth <Sebastian.Serth@hpi.de>
Date: Thu, 15 Oct 2020 18:11:28 +0200
Subject: [PATCH] Adjust default message for linter / unit test

---
 app/controllers/concerns/submission_scoring.rb | 12 +++++++++---
 config/locales/de.yml                          |  3 ++-
 config/locales/en.yml                          |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/controllers/concerns/submission_scoring.rb b/app/controllers/concerns/submission_scoring.rb
index f8acd267..4fc8d737 100644
--- a/app/controllers/concerns/submission_scoring.rb
+++ b/app/controllers/concerns/submission_scoring.rb
@@ -29,7 +29,7 @@ module SubmissionScoring
             waiting_for_container_time: output[:waiting_for_container_time]
         ).save
         output.merge!(assessment)
-        output.merge!(filename: file.name_with_extension, message: feedback_message(file, output[:score]), weight: file.weight)
+        output.merge!(filename: file.name_with_extension, message: feedback_message(file, output), weight: file.weight)
         # end
       end
       future.value
@@ -45,9 +45,15 @@ module SubmissionScoring
 
   private :execute_test_file
 
-  def feedback_message(file, score)
+  def feedback_message(file, output)
     set_locale
-    score == Assessor::MAXIMUM_SCORE ? I18n.t('exercises.implement.default_feedback') : render_markdown(file.feedback_message)
+    if output[:score] == Assessor::MAXIMUM_SCORE && output[:file_role] == 'teacher_defined_test'
+      I18n.t('exercises.implement.default_test_feedback')
+    elsif output[:score] == Assessor::MAXIMUM_SCORE && output[:file_role] == 'teacher_defined_linter'
+      I18n.t('exercises.implement.default_linter_feedback')
+    else
+      render_markdown(file.feedback_message)
+    end
   end
 
   def score_submission(submission)
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0aa5c30f..b69782a3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -366,7 +366,8 @@ de:
       alert:
         text: 'Ihr Browser unterstützt nicht alle Funktionalitäten, die %{application_name} benötigt. Bitte nutzen Sie einen modernen Browser, um %{application_name} zu besuchen.'
         title: Ihr Browser wird nicht unterstützt!
-      default_feedback: Sehr gut. Alle Tests waren erfolgreich.
+      default_test_feedback: Sehr gut. Alle Tests waren erfolgreich.
+      default_linter_feedback: Sehr gut. Der Linter hat nichts mehr zu beanstanden.
       error_messages: Fehlermeldungen
       messages: Meldungen
       feedback: Feedback
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 004d104d..b94b011a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -366,7 +366,8 @@ en:
       alert:
         text: 'Your browser does not support features required for using %{application_name}. Please access %{application_name} using a modern browser.'
         title: Your browser is not supported!
-      default_feedback: Well done. All tests have been passed.
+      default_test_feedback: Well done. All tests have been passed.
+      default_linter_feedback: Well done. The linter is completly satisfied.
       error_messages: Error Messages
       messages: Messages
       feedback: Feedback