Merge pull request #18 from samikoskinen/master

Fix a logic error in validation of responses with both data and included

Author: Derek Dowling

document.go

@@ -95,7 +95,7 @@ func (d *Document) Validate(r *http.Request, response bool) *Error {
 	if d.HasErrors() && d.HasData() {
 		return ISE("Both `errors` and `data` cannot be set for a JSON response")
 	}
-	if d.HasData() && d.Included != nil {
+	if !d.HasData() && d.Included != nil {
 		return ISE("'included' should only be set for a response if 'data' is as well")
 	}
 

document_test.go

@@ -71,13 +71,44 @@ func TestDocument(t *testing.T) {
 				Status: http.StatusAccepted,
 			}
 
+			testObjectForInclusion := &Object{
+				ID: "1",
+				Type: "Included",
+			}
+
+			req := &http.Request{Method: "GET"}
+
 			Convey("should accept an object", func() {
 				doc := Build(testObject)
 
 				So(doc.Data, ShouldResemble, List{testObject})
 				So(doc.Status, ShouldEqual, http.StatusAccepted)
 			})
 
+			Convey("should not accept an included object without objects in data", func() {
+				doc := New()
+				doc.Included = append(doc.Included, testObjectForInclusion)
+				doc.Status = 200
+
+				validationErrors := doc.Validate(req, true)
+
+				So(validationErrors, ShouldNotBeNil)
+			})
+
+			Convey("should accept an object in data and an included object", func() {
+				doc := Build(testObject)
+				doc.Included = append(doc.Included, testObjectForInclusion)
+
+				validationErrors := doc.Validate(req, true)
+
+				So(validationErrors, ShouldBeNil)
+				So(doc.Data, ShouldResemble, List{testObject})
+				So(doc.Included, ShouldNotBeEmpty)
+				So(doc.Included[0], ShouldResemble, testObjectForInclusion)
+				So(doc.Status, ShouldEqual, http.StatusAccepted)
+			})
+
+
 			Convey("should accept a list", func() {
 				list := List{testObject}
 				doc := Build(list)