From 808ebfa1c1933c93535ff243c32a89c787949831 Mon Sep 17 00:00:00 2001 From: Matt Fellows Date: Fri, 18 May 2018 22:55:20 +1000 Subject: [PATCH] fix(broker): use 'pb:pacts' instead 'pacts'. See #82 --- dsl/broker.go | 2 +- dsl/broker_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dsl/broker.go b/dsl/broker.go index b4ec6c932..b6fe0a981 100644 --- a/dsl/broker.go +++ b/dsl/broker.go @@ -31,7 +31,7 @@ type PactLink struct { // HalLinks represents the _links key in a HAL document. type HalLinks struct { - Pacts []PactLink `json:"pacts"` + Pacts []PactLink `json:"pb:pacts"` } // HalDoc is a simple representation of the HAL response from a Pact Broker. diff --git a/dsl/broker_test.go b/dsl/broker_test.go index 5e59823ef..48f1e2f1b 100644 --- a/dsl/broker_test.go +++ b/dsl/broker_test.go @@ -186,7 +186,7 @@ func setupMockBroker(auth bool) *httptest.Server { // curl --user pactuser:pact -H "accept: application/hal+json" "http://pact.onegeek.com.au/pacts/provider/bobby/latest" mux.HandleFunc("/pacts/provider/bobby/latest", authFunc(func(w http.ResponseWriter, req *http.Request) { log.Println("[DEBUG] get pacts for provider 'bobby'") - fmt.Fprintf(w, `{"_links":{"self":{"href":"%s/pacts/provider/bobby/latest","title":"Latest pact versions for the provider bobby"},"provider":{"href":"%s/pacticipants/bobby","title":"bobby"},"pacts":[{"href":"%s/pacts/provider/bobby/consumer/jessica/version/2.0.0","title":"Pact between jessica (v2.0.0) and bobby","name":"jessica"},{"href":"%s/pacts/provider/bobby/consumer/billy/version/1.0.0","title":"Pact between billy (v1.0.0) and bobby","name":"billy"}]}}`, server.URL, server.URL, server.URL, server.URL) + fmt.Fprintf(w, `{"_links":{"self":{"href":"%s/pacts/provider/bobby/latest","title":"Latest pact versions for the provider bobby"},"provider":{"href":"%s/pacticipants/bobby","title":"bobby"},"pb:pacts":[{"href":"%s/pacts/provider/bobby/consumer/jessica/version/2.0.0","title":"Pact between jessica (v2.0.0) and bobby","name":"jessica"},{"href":"%s/pacts/provider/bobby/consumer/billy/version/1.0.0","title":"Pact between billy (v1.0.0) and bobby","name":"billy"}]}}`, server.URL, server.URL, server.URL, server.URL) w.Header().Add("Content-Type", "application/hal+json") })) @@ -194,7 +194,7 @@ func setupMockBroker(auth bool) *httptest.Server { // curl --user pactuser:pact -H "accept: application/hal+json" "http://pact.onegeek.com.au/pacts/provider/bobby/latest/sit4" mux.Handle("/pacts/provider/bobby/latest/prod", authFunc(func(w http.ResponseWriter, req *http.Request) { log.Println("[DEBUG] get all pacts for provider 'bobby' where the tag 'prod' exists") - fmt.Fprintf(w, `{"_links":{"self":{"href":"%s/pacts/provider/bobby/latest/dev","title":"Latest pact versions for the provider bobby with tag 'dev'"},"provider":{"href":"%s/pacticipants/bobby","title":"bobby"},"pacts":[{"href":"%s/pacts/provider/bobby/consumer/billy/version/1.0.0","title":"Pact between billy (v1.0.0) and bobby","name":"billy"}]}}`, server.URL, server.URL, server.URL) + fmt.Fprintf(w, `{"_links":{"self":{"href":"%s/pacts/provider/bobby/latest/dev","title":"Latest pact versions for the provider bobby with tag 'dev'"},"provider":{"href":"%s/pacticipants/bobby","title":"bobby"},"pb:pacts":[{"href":"%s/pacts/provider/bobby/consumer/billy/version/1.0.0","title":"Pact between billy (v1.0.0) and bobby","name":"billy"}]}}`, server.URL, server.URL, server.URL) w.Header().Add("Content-Type", "application/hal+json") })) @@ -217,7 +217,7 @@ func setupMockBroker(auth bool) *httptest.Server { // curl --user pactuser:pact -H "accept: application/hal+json" "http://pact.onegeek.com.au/pacts/provider/bobby/latest/sit4" mux.Handle("/pacts/provider/bobby/latest/dev", authFunc(func(w http.ResponseWriter, req *http.Request) { log.Println("[DEBUG] get all pacts for provider 'bobby' where the tag 'dev' exists") - fmt.Fprintf(w, `{"_links":{"self":{"href":"%s/pacts/provider/bobby/latest/dev","title":"Latest pact versions for the provider bobby with tag 'dev'"},"provider":{"href":"%s/pacticipants/bobby","title":"bobby"},"pacts":[{"href":"%s/pacts/provider/bobby/consumer/billy/version/1.0.1","title":"Pact between billy (v1.0.1) and bobby","name":"billy"}]}}`, server.URL, server.URL, server.URL) + fmt.Fprintf(w, `{"_links":{"self":{"href":"%s/pacts/provider/bobby/latest/dev","title":"Latest pact versions for the provider bobby with tag 'dev'"},"provider":{"href":"%s/pacticipants/bobby","title":"bobby"},"pb:pacts":[{"href":"%s/pacts/provider/bobby/consumer/billy/version/1.0.1","title":"Pact between billy (v1.0.1) and bobby","name":"billy"}]}}`, server.URL, server.URL, server.URL) w.Header().Add("Content-Type", "application/hal+json") }))