Update all template components in tests to use new style types

nyaruka · Jun 10, 2024 · b6e3b34 · b6e3b34
1 parent 50bcb45
commit b6e3b34
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/assets/template.go b/assets/template.go
@@ -24,8 +24,8 @@ type TemplateUUID uuids.UUID
 //	       },
 //	       "components": [
 //	         {
-//	           "type": "body",
 //	           "name": "body",
+//	           "type": "body/text",
 //	           "content": "Hello {{1}}",
 //	           "variables": {"1": 0}
 //	         }
@@ -40,8 +40,8 @@ type TemplateUUID uuids.UUID
 //	       },
 //	       "components": [
 //	         {
-//	           "type": "body",
 //	           "name": "body",
+//	           "type": "body/text",
 //	           "content": "Bonjour {{1}}",
 //	           "variables": {"1": 0}
 //	         }

diff --git a/flows/actions/testdata/_assets.json b/flows/actions/testdata/_assets.json
@@ -259,8 +259,8 @@
                     "locale": "eng-US",
                     "components": [
                         {
-                            "type": "body",
                             "name": "body",
+                            "type": "body/text",
                             "content": "Hi {{1}}, who's an excellent {{2}}?",
                             "variables": {
                                 "1": 0,
@@ -285,8 +285,8 @@
                     "locale": "spa",
                     "components": [
                         {
-                            "type": "body",
                             "name": "body",
+                            "type": "body/text",
                             "content": "Hola {{1}}, quien es un {{2}} excelente?",
                             "variables": {
                                 "1": 0,
@@ -317,8 +317,8 @@
                     "locale": "eng",
                     "components": [
                         {
-                            "type": "body",
                             "name": "body",
+                            "type": "body/text",
                             "content": "Hi there, it's time to get up!",
                             "variables": {}
                         }

diff --git a/flows/actions/testdata/send_msg.json b/flows/actions/testdata/send_msg.json
@@ -445,8 +445,8 @@
                         "namespace": "",
                         "components": [
                             {
-                                "type": "body",
                                 "name": "body",
+                                "type": "body/text",
                                 "variables": {
                                     "1": 0,
                                     "2": 1
@@ -538,8 +538,8 @@
                         "namespace": "",
                         "components": [
                             {
-                                "type": "body",
                                 "name": "body",
+                                "type": "body/text",
                                 "variables": {
                                     "1": 0,
                                     "2": 1
@@ -851,8 +851,8 @@
                                 }
                             },
                             {
-                                "type": "button/quick_reply",
                                 "name": "button.0",
+                                "type": "button/quick_reply",
                                 "variables": {
                                     "1": 2
                                 }

diff --git a/flows/msg_test.go b/flows/msg_test.go
@@ -166,13 +166,13 @@ func TestMsgTemplating(t *testing.T) {
 	msgTemplating := flows.NewMsgTemplating(
 		templateRef,
 		"0162a7f4_dfe4_4c96_be07_854d5dba3b2b",
-		[]*flows.TemplatingComponent{{Type: "body", Name: "body", Variables: map[string]int{"1": 0, "2": 1}}},
+		[]*flows.TemplatingComponent{{Type: "body/text", Name: "body", Variables: map[string]int{"1": 0, "2": 1}}},
 		[]*flows.TemplatingVariable{{Type: "text", Value: "Ryan Lewis"}, {Type: "text", Value: "boy"}},
 	)
 
 	assert.Equal(t, templateRef, msgTemplating.Template)
 	assert.Equal(t, "0162a7f4_dfe4_4c96_be07_854d5dba3b2b", msgTemplating.Namespace)
-	assert.Equal(t, []*flows.TemplatingComponent{{Type: "body", Name: "body", Variables: map[string]int{"1": 0, "2": 1}}}, msgTemplating.Components)
+	assert.Equal(t, []*flows.TemplatingComponent{{Type: "body/text", Name: "body", Variables: map[string]int{"1": 0, "2": 1}}}, msgTemplating.Components)
 	assert.Equal(t, []*flows.TemplatingVariable{{Type: "text", Value: "Ryan Lewis"}, {Type: "text", Value: "boy"}}, msgTemplating.Variables)
 
 	// test marshaling our msg
@@ -187,8 +187,8 @@ func TestMsgTemplating(t *testing.T) {
 		"namespace":"0162a7f4_dfe4_4c96_be07_854d5dba3b2b",
 		"components":[
 			{
-				"type": "body",
 				"name": "body",
+				"type": "body/text",
 				"variables": {"1": 0, "2": 1}
 			}
 		],