Merge pull request #19 from senseyeio/bugfix/behaviors_unmarshal

Fixes issue with unmarshalling a Response with Behavior

dto.go

@@ -406,11 +406,13 @@ func (r *Response) UnmarshalJSON(b []byte) error {
 	// Handle and delete behaviors from the DTO map before we check the
 	// type so that we can enforce only one type exists in the map.
 	if b, ok := dto[keyBehaviors]; ok {
-		err = json.Unmarshal(b, r.Behaviors)
+		behaviors := new(Behaviors)
+		err = json.Unmarshal(b, behaviors)
 		if err != nil {
 			return err
 		}
 		delete(dto, keyBehaviors)
+		r.Behaviors = behaviors
 	}
 
 	for key, b := range dto {

dto_test.go

@@ -661,6 +661,9 @@ func TestImposter_UnmarshalJSON(t *testing.T) {
 									},
 									"body": `{"response":true}`,
 								},
+								"_behaviors": map[string]interface{}{
+									"wait": 500,
+								},
 							},
 						},
 					},
@@ -702,6 +705,9 @@ func TestImposter_UnmarshalJSON(t *testing.T) {
 									},
 									Body: `{"response":true}`,
 								},
+								Behaviors: &mbgo.Behaviors{
+									Wait: 500,
+								},
 							},
 						},
 					},