Update tests

slovensko-digital · Dec 7, 2023 · bfc784b · bfc784b
1 parent 4a17792
commit bfc784b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/app/models/message_object.rb b/app/models/message_object.rb
@@ -47,7 +47,7 @@ def self.create_message_objects(message, objects)
   end
 
   def content
-    message_object_datum&.blob
+    message_object_datum&.blob&.force_encoding('UTF-8')
   end
 
   def form?

diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
@@ -4,6 +4,7 @@ ssd_main_general_one:
   uuid: <%= SecureRandom.uuid %>
   title: The First Message
   sender_name: Social Department
+  recipient_name: SSD
   html_visualization: Visualization 1
   delivered_at: 2023-05-18 16:16:26
   thread: ssd_main_general

diff --git a/test/lib/message_template_parser_test.rb b/test/lib/message_template_parser_test.rb
@@ -12,13 +12,13 @@ class MessageTemplateParserTest < ActiveSupport::TestCase
     assert_equal '{{ Predmet:text_field }}', template_items.first[:placeholder]
     assert_equal 'Predmet', template_items.first[:name]
     assert_equal false, template_items.first[:required]
-    assert_equal nil, template_items.first[:default_value]
+    assert_nil template_items.first[:default_value]
     assert_equal 'text_field', template_items.first[:type]
 
     assert_equal '{{ Text:text_area }}', template_items.second[:placeholder]
     assert_equal 'Text', template_items.second[:name]
     assert_equal false, template_items.second[:required]
-    assert_equal nil, template_items.second[:default_value]
+    assert_nil template_items.second[:default_value]
     assert_equal 'text_area', template_items.second[:type]
   end
 
@@ -31,7 +31,7 @@ class MessageTemplateParserTest < ActiveSupport::TestCase
     assert_equal '{{ IČO*:text_field }}', template_items.first[:placeholder]
     assert_equal 'IČO', template_items.first[:name]
     assert_equal true, template_items.first[:required]
-    assert_equal nil, template_items.first[:default_value]
+    assert_nil template_items.first[:default_value]
     assert_equal 'text_field', template_items.first[:type]
 
     assert_equal '{{ Kontaktná osoba*:text_field:"Ján Suchal" }}', template_items.second[:placeholder]
@@ -61,13 +61,13 @@ class MessageTemplateParserTest < ActiveSupport::TestCase
     assert_equal '{{ Dátum začiatku platnosti*:date_field }}', template_items[5][:placeholder]
     assert_equal 'Dátum začiatku platnosti', template_items[5][:name]
     assert_equal true, template_items[5][:required]
-    assert_equal nil, template_items[5][:default_value]
+    assert_nil template_items[5][:default_value]
     assert_equal 'date_field', template_items[5][:type]
 
     assert_equal '{{ Digitálny odtlačok*:text_field }}', template_items[6][:placeholder]
     assert_equal 'Digitálny odtlačok', template_items[6][:name]
     assert_equal true, template_items[6][:required]
-    assert_equal nil, template_items[6][:default_value]
+    assert_nil template_items[6][:default_value]
     assert_equal 'text_field', template_items[6][:type]
 
   end

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
@@ -40,7 +40,8 @@ class MessageTest < ActiveSupport::TestCase
     message = messages(:ssd_main_general_one)
     user = users(:basic)
 
-    reply = MessageDraft.create_message_reply(original_message: message, author: user)
+    reply = MessageDraft.new
+    MessageTemplate.reply_template.create_message_reply(reply, original_message: message, author: user)
 
     assert_equal reply.sender_name, message.recipient_name
     assert_equal reply.recipient_name, message.sender_name

diff --git a/test/models/upvs/message_template_test.rb b/test/models/upvs/message_template_test.rb
@@ -15,6 +15,6 @@ class Upvs::MessageTemplateTest < ActiveSupport::TestCase
 
     message_template.build_message_from_template(message_draft)
 
-    assert_equal '<GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9"> <subject>Odpoveď</subject> <text>Odpoveď k rozhodnutiu...</text> </GeneralAgenda>', message_draft.form.message_object_datum.blob
+    assert_equal '<GeneralAgenda xmlns="http://schemas.gov.sk/form/App.GeneralAgenda/1.9"> <subject>Odpoveď</subject> <text>Odpoveď k rozhodnutiu...</text> </GeneralAgenda>', message_draft.form.content
   end
 end