Rebase on updated origin/master.

Fix the test to not be sensitive to array ordering. Re-generate on master as there was a schema change.
99designs · Apr 18, 2022 · fc582da · fc582da
1 parent ee3c216
commit fc582da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/codegen/testserver/followschema/nulls_test.go b/codegen/testserver/followschema/nulls_test.go
@@ -93,7 +93,8 @@ func TestNullBubbling(t *testing.T) {
 		}
 		err := c.Post(`query { valid, errorBubbleList { id } }`, &resp)
 
-		require.EqualError(t, err, `[{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",2]},{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",1]}]`)
+		require.Contains(t, err.Error(), `{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",2]}`)
+		require.Contains(t, err.Error(), `{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",1]}`)
 		require.Nil(t, resp.ErrorBubbleList)
 		require.Equal(t, "Ok", resp.Valid)
 	})

diff --git a/codegen/testserver/followschema/schema.generated.go b/codegen/testserver/followschema/schema.generated.go
diff --git a/codegen/testserver/singlefile/generated.go b/codegen/testserver/singlefile/generated.go
diff --git a/codegen/testserver/singlefile/nulls_test.go b/codegen/testserver/singlefile/nulls_test.go
@@ -93,7 +93,8 @@ func TestNullBubbling(t *testing.T) {
 		}
 		err := c.Post(`query { valid, errorBubbleList { id } }`, &resp)
 
-		require.EqualError(t, err, `[{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",2]},{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",1]}]`)
+		require.Contains(t, err.Error(), `{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",2]}`)
+		require.Contains(t, err.Error(), `{"message":"the requested element is null which the schema does not allow","path":["errorBubbleList",1]}`)
 		require.Nil(t, resp.ErrorBubbleList)
 		require.Equal(t, "Ok", resp.Valid)
 	})