Merge pull request #123 from TonPC64/master

omitempty size in SpacerComponent of flex message
line · Feb 12, 2019 · dd918fb · dd918fb
2 parents c4086b7 + 05fa3a6
commit dd918fb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/linebot/flex.go b/linebot/flex.go
@@ -496,7 +496,7 @@ type SpacerComponent struct {
 func (c *SpacerComponent) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		Type FlexComponentType  `json:"type"`
-		Size FlexSpacerSizeType `json:"size"`
+		Size FlexSpacerSizeType `json:"size,omitempty"`
 	}{
 		Type: FlexComponentTypeSpacer,
 		Size: c.Size,

diff --git a/linebot/flex_test.go b/linebot/flex_test.go
@@ -270,6 +270,13 @@ func TestUnmarshalFlexMessageJSON(t *testing.T) {
       {
         "type": "spacer",
         "size": "sm"
+      },
+      {
+        "type": "spacer"
+      },
+      {
+        "type": "spacer",
+        "size": "xs"
       }
     ],
     "flex": 0
@@ -415,6 +422,13 @@ func TestUnmarshalFlexMessageJSON(t *testing.T) {
 							Type: FlexComponentTypeSpacer,
 							Size: FlexSpacerSizeTypeSm,
 						},
+						&SpacerComponent{
+							Type: FlexComponentTypeSpacer,
+						},
+						&SpacerComponent{
+							Type: FlexComponentTypeSpacer,
+							Size: FlexSpacerSizeTypeXs,
+						},
 					},
 					Spacing: FlexComponentSpacingTypeSm,
 				},

diff --git a/linebot/send_message_test.go b/linebot/send_message_test.go
@@ -385,6 +385,9 @@ func TestPushMessages(t *testing.T) {
 									Type: FlexComponentTypeText,
 									Text: "world",
 								},
+								&SpacerComponent{
+									Type: FlexComponentTypeSpacer,
+								},
 							},
 						},
 					},
@@ -393,7 +396,7 @@ func TestPushMessages(t *testing.T) {
 			ResponseCode: 200,
 			Response:     []byte(`{}`),
 			Want: want{
-				RequestBody: []byte(`{"to":"U0cc15697597f61dd8b01cea8b027050e","messages":[{"type":"flex","altText":"this is a flex message","contents":{"type":"bubble","body":{"type":"box","layout":"vertical","contents":[{"type":"text","text":"hello"},{"type":"text","text":"world"}]}}}]}` + "\n"),
+				RequestBody: []byte(`{"to":"U0cc15697597f61dd8b01cea8b027050e","messages":[{"type":"flex","altText":"this is a flex message","contents":{"type":"bubble","body":{"type":"box","layout":"vertical","contents":[{"type":"text","text":"hello"},{"type":"text","text":"world"},{"type":"spacer"}]}}}]}` + "\n"),
 				Response:    &BasicResponse{},
 			},
 		},