Merge branch 'master' into regex

examples/regex.yaml

@@ -1,7 +1,7 @@
 ---
  - name: Regex example
    request:
-     uri: /hello
+     uri: /hello/chris
      regexuri: "\\/hello\\/[a-z]+"
      method: GET
    response:

mockingjay/fakeendpoint.go

@@ -32,10 +32,13 @@ func (f FakeEndpoint) isValid() error {
 }
 
 var (
-	errDuplicateRequestsError = errors.New("There were duplicated requests in YAML")
-	errResponseInvalid        = errors.New("Response is not configured correctly")
+	errResponseInvalid = errors.New("Response is not configured correctly")
 )
 
+func errDuplicateRequestsError(duplicates []string) error {
+	return fmt.Errorf("There were duplicated requests in YAML %v", duplicates)
+}
+
 // NewFakeEndpoints returns an array of Endpoints from a YAML byte array. Returns an error if YAML cannot be parsed
 func NewFakeEndpoints(data []byte) (endpoints []FakeEndpoint, err error) {
 	err = yaml.Unmarshal(data, &endpoints)
@@ -52,19 +55,27 @@ func NewFakeEndpoints(data []byte) (endpoints []FakeEndpoint, err error) {
 		}
 	}
 
-	if isDuplicates(endpoints) {
-		return nil, errDuplicateRequestsError
+	if duplicates := findDuplicates(endpoints); len(duplicates) > 0 {
+		return nil, errDuplicateRequestsError(duplicates)
 	}
 
 	return
 }
 
-func isDuplicates(endpoints []FakeEndpoint) bool {
-	requests := make(map[string]bool)
+func findDuplicates(endpoints []FakeEndpoint) []string {
+	requests := make(map[string]int)
 
 	for _, e := range endpoints {
-		requests[e.Request.hash()] = true
+		requests[e.Request.hash()] = requests[e.Request.hash()] + 1
+	}
+
+	var duplicates []string
+
+	for k, v := range requests {
+		if v > 1 {
+			duplicates = append(duplicates, k)
+		}
 	}
 
-	return len(requests) != len(endpoints)
+	return duplicates
 }

mockingjay/fakeendpoint_test.go

@@ -200,8 +200,8 @@ func TestItReturnsErrorWhenRequestsAreDuplicated(t *testing.T) {
 		t.Fatal("Expected an error to be returned for duplicated requests")
 	}
 
-	if err != errDuplicateRequestsError {
-		t.Error("Expected", errDuplicateRequestsError, "but got", err)
+	if !strings.Contains(err.Error(), "duplicated") {
+		t.Error("Unexpeted error message", err)
 	}
 }
 

mockingjay/request.go

@@ -87,7 +87,7 @@ func (r Request) String() string {
 }
 
 func (r Request) hash() string {
-	return fmt.Sprintf("%v%v%v%v", r.URI, r.Method, r.Headers, r.Body)
+	return fmt.Sprintf("URI: %v | METHOD: %v | HEADERS: %v | BODY: %v", r.URI, r.Method, r.Headers, r.Body)
 }
 
 func requestMatches(a, b Request) bool {