Merge pull request cloudflare#691 from favonia/improve-zone-test

test(zone): refactor testing of zone.go
boekkooi-lengoo · Aug 15, 2021 · b85431c · b85431c
2 parents b24251b + e8fa176
commit b85431c
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/zone_test.go b/zone_test.go
@@ -1384,16 +1384,9 @@ func TestListZones(t *testing.T) {
 			count = total - start
 		}
 
-		res, err := json.Marshal(mockZonesResponse(total, page, start, count))
-		if !assert.NoError(t, err) {
-			return
-		}
-
 		w.Header().Set("content-type", "application/json")
-
-		if _, err = w.Write(res); assert.NoError(t, err) {
-			return
-		}
+		err := json.NewEncoder(w).Encode(mockZonesResponse(total, page, start, count))
+		assert.NoError(t, err)
 	}
 
 	mux.HandleFunc("/zones", handler)
@@ -1443,16 +1436,9 @@ func TestListZonesFailingPages(t *testing.T) {
 			count = total - start
 		}
 
-		res, err := json.Marshal(mockZonesResponse(total, page, start, count))
-		if !assert.NoError(t, err) {
-			return
-		}
-
 		w.Header().Set("content-type", "application/json")
-
-		if _, err = w.Write(res); assert.NoError(t, err) {
-			return
-		}
+		err := json.NewEncoder(w).Encode(mockZonesResponse(total, page, start, count))
+		assert.NoError(t, err)
 	}
 
 	mux.HandleFunc("/zones", handler)