test: move to cupaloy for snapshots

Makefile

@@ -161,4 +161,8 @@ migrations-render-replace: .bin/ory
 
 .PHONY: migratest-refresh
 migratest-refresh:
-		cd persistence/sql/migratest; go test -tags sqlite,refresh -short .
+		cd persistence/sql/migratest; UPDATE_SNAPSHOTS=true go test -tags sqlite -short .
+
+.PHONY: test-update-snapshots
+test-update-snapshots:
+		UPDATE_SNAPSHOTS=true go test -tags sqlite -short ./...

README.md

@@ -164,7 +164,7 @@ that your company deserves a spot here, reach out to
             <td>DataDetect</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/datadetect.svg" alt="Datadetect"></td>
             <td><a href="https://unifiedglobalarchiving.com/data-detect/">unifiedglobalarchiving.com/data-detect/</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Adopter *</td>
             <td>Sainsbury's</td>
@@ -182,13 +182,13 @@ that your company deserves a spot here, reach out to
             <td>Reyah</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/reyah.svg" alt="Reyah"></td>
             <td><a href="https://reyah.eu/">reyah.eu</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Adopter *</td>
             <td>Zero</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/commitzero.svg" alt="Project Zero by Commit"></td>
             <td><a href="https://getzero.dev/">getzero.dev</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Adopter *</td>
             <td>Padis</td>
@@ -206,7 +206,7 @@ that your company deserves a spot here, reach out to
             <td>Spiri.bo</td>
             <td align="center"><img height="32px" src="https://raw.githubusercontent.com/ory/meta/master/static/adopters/spiribo.svg" alt="Spiri.bo"></td>
             <td><a href="https://spiri.bo/">spiri.bo</a></td>
-        </tr>        
+        </tr>
         <tr>
             <td>Sponsor</td>
             <td>Strivacity</td>
@@ -449,6 +449,14 @@ go test -tags sqlite ./...
 cd client; go test  -tags sqlite  .
 ```
 
+##### Updating Test Fixtures
+
+Some tests use fixtures. If payloads change, you can update them with:
+
+```
+make test-update-snapshots
+```
+
 ##### End-to-End Tests
 
 We use [Cypress](https://www.cypress.io) to run our e2e tests.

go.mod

@@ -3,6 +3,12 @@ module github.com/ory/kratos
 go 1.16
 
 replace (
+	github.com/bradleyjkemp/cupaloy/v2 => github.com/aeneasr/cupaloy/v2 v2.6.1-0.20210924214125-3dfdd01210a3
+	github.com/gobuffalo/pop/v5 => github.com/gobuffalo/pop/v5 v5.3.4-0.20210608105745-bb07a373cc0e
+	github.com/luna-duclos/instrumentedsql => github.com/ory/instrumentedsql v1.2.0
+	github.com/luna-duclos/instrumentedsql/opentracing => github.com/ory/instrumentedsql/opentracing v0.0.0-20210903114257-c8963b546c5c
+	github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.7-0.20210414154423-1157a4212dcb
+	github.com/oleiade/reflections => github.com/oleiade/reflections v1.0.1
 	github.com/gobuffalo/pop/v5 => github.com/gobuffalo/pop/v5 v5.3.4-0.20210608105745-bb07a373cc0e
 	github.com/luna-duclos/instrumentedsql => github.com/ory/instrumentedsql v1.2.0
 	github.com/luna-duclos/instrumentedsql/opentracing => github.com/ory/instrumentedsql/opentracing v0.0.0-20210903114257-c8963b546c5c
@@ -18,9 +24,8 @@ replace (
 	github.com/gobuffalo/pop/v5 => github.com/gobuffalo/pop/v5 v5.3.4-0.20210608105745-bb07a373cc0e
 	github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.7-0.20210414154423-1157a4212dcb
 	github.com/ory/x => github.com/ory/x v0.0.276
-	github.com/oleiade/reflections => github.com/oleiade/reflections v1.0.1
-	github.com/luna-duclos/instrumentedsql => github.com/ory/instrumentedsql v1.2.0
-	github.com/luna-duclos/instrumentedsql/opentracing => github.com/ory/instrumentedsql/opentracing v0.0.0-20210903114257-c8963b546c5c
+	go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.4.6
+	gopkg.in/DataDog/dd-trace-go.v1 => gopkg.in/DataDog/dd-trace-go.v1 v1.27.1-0.20201005154917-54b73b3e126a
 )
 
 require (
@@ -30,6 +35,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.0.0
 	github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0
 	github.com/avast/retry-go/v3 v3.1.1
+	github.com/bradleyjkemp/cupaloy/v2 v2.3.0
 	github.com/bwmarrin/discordgo v0.23.0
 	github.com/bxcodec/faker/v3 v3.3.1
 	github.com/cenkalti/backoff v2.2.1+incompatible

go.sum

@@ -99,6 +99,8 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:H
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
+github.com/aeneasr/cupaloy/v2 v2.6.1-0.20210924214125-3dfdd01210a3 h1:/SkiUr3JJzun9QN9cpUVCPri2ZwOFJ3ani+F3vdoCiY=
+github.com/aeneasr/cupaloy/v2 v2.6.1-0.20210924214125-3dfdd01210a3/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmDlfhUrweEy1R1Fj1gu5iIM=

internal/testhelpers/snapshot.go

@@ -0,0 +1,25 @@
+package testhelpers
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/bradleyjkemp/cupaloy/v2"
+	"github.com/stretchr/testify/require"
+	"github.com/tidwall/sjson"
+)
+
+func SnapshotTExcept(t *testing.T, actual interface{}, except []string) {
+	compare, err := json.MarshalIndent(actual, "", "  ")
+	require.NoError(t, err, "%+v", actual)
+	for _, e := range except {
+		compare, err = sjson.DeleteBytes(compare, e)
+		require.NoError(t, err, "%s", e)
+	}
+
+	cupaloy.New(
+		cupaloy.CreateNewAutomatically(true),
+		cupaloy.FailOnUpdate(true),
+		cupaloy.SnapshotFileExtension(".json"),
+	).SnapshotT(t, compare)
+}

persistence/sql/migratest/fixtures/identity/196d8c1e-4f04-40f0-94b3-5ec43996b28a.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity/2ae6a5a7-2983-49e7-a4d8-7740b37c88cb.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity/359963ec-b09b-4ea0-aece-fb4dd95f304a.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity/5ff66179-c240-4703-b0d8-494592cefff5.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity/a251ebc2-880c-4f76-a8f3-38e6940eab0e.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity/d7b9addb-ac15-4bc2-9fa5-562e0bf48755.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity/ed253b2c-48ed-4c58-9b6f-1dc963c30a66.json

@@ -8,4 +8,4 @@
   },
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity_recovery_address/b8293f1c-010f-45d9-b809-f3fc5365ba80.json

@@ -4,4 +4,4 @@
   "via": "email",
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity_verification_address/45e867e9-2745-4f16-8dd4-84334a252b61.json

@@ -6,4 +6,4 @@
   "status": "pending",
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity_verification_address/b2d59320-8564-4400-a39f-a22a497a23f1.json

@@ -6,4 +6,4 @@
   "status": "pending",
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity_verification_address/c2427b6d-312b-46d9-9285-536db7ae11fd.json

@@ -6,4 +6,4 @@
   "status": "pending",
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/identity_verification_address/d4718a67-aec2-418d-8173-6ebc7bde3b86.json

@@ -6,4 +6,4 @@
   "status": "pending",
   "created_at": "2013-10-07T08:23:19Z",
   "updated_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/login_flow/0bc96cc9-dda4-4700-9e42-35731f2af91e.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/1fb23c75-b809-42cc-8984-6ca2d0a1192f.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal2"
-}
+}

persistence/sql/migratest/fixtures/login_flow/202c1981-1e25-47f0-8764-75ad506c2bec.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/38caf592-b042-4551-b92f-8d5223c2a4e2.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal2"
-}
+}

persistence/sql/migratest/fixtures/login_flow/3a9ea34f-0f12-469b-9417-3ae5795a7baa.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/43c99182-bb67-47e1-b564-bb23bd8d4393.json

@@ -4,6 +4,7 @@
   "expires_at": "2013-10-07T08:23:19Z",
   "issued_at": "2013-10-07T08:23:19Z",
   "request_url": "http://kratos:4433/self-service/browser/flows/login?prompt=login\u0026return_to=http%3A%2F%2F127.0.0.1%3A4455%2F.ory%2Fkratos%2Fpublic%2Fself-service%2Fbrowser%2Fflows%2Fsettings%2Fstrategies%2Fprofile%3Frequest%3D74fd6c53-7651-453e-90b8-2c5adbf911bb",
+  "return_to": "http://127.0.0.1:4455/.ory/kratos/public/self-service/browser/flows/settings/strategies/profile?request=74fd6c53-7651-453e-90b8-2c5adbf911bb",
   "ui": {
     "action": "",
     "method": "",
@@ -13,4 +14,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": true,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/47edd3a8-0998-4779-9469-f4b8ee4430df.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/56d94e8b-8a5d-4b7f-8a6e-3259d2b2903e.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/6d387820-f2f4-4f9f-9980-a90d89e7811f.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/916ded11-aa64-4a27-b06e-96e221a509d7.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/99974ce6-388c-4669-a95a-7757ee724020.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/b1fac7fb-d016-4a06-a7fe-e4eab2a0429f.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/login_flow/d6aa1f23-88c9-4b9b-a850-392f48c7f9e8.json

@@ -13,4 +13,4 @@
   "updated_at": "2013-10-07T08:23:19Z",
   "forced": false,
   "requested_aal": "aal1"
-}
+}

persistence/sql/migratest/fixtures/recovery_flow/0d14427f-e16d-43a5-8695-8278bf85d4eb.json

@@ -11,4 +11,4 @@
     "nodes": null
   },
   "state": "choose_method"
-}
+}

persistence/sql/migratest/fixtures/recovery_flow/13178936-095a-466b-abe0-36d977d3dc18.json

@@ -11,4 +11,4 @@
     "nodes": null
   },
   "state": "choose_method"
-}
+}

persistence/sql/migratest/fixtures/recovery_flow/4963f305-e874-4a68-8424-a00bec679e7b.json

@@ -11,4 +11,4 @@
     "nodes": null
   },
   "state": "choose_method"
-}
+}

persistence/sql/migratest/fixtures/recovery_flow/68fb4010-84a9-4d1e-9f92-2705978ee89e.json

@@ -11,4 +11,4 @@
     "nodes": null
   },
   "state": "choose_method"
-}
+}

persistence/sql/migratest/fixtures/recovery_flow/87e871e1-a45f-4ed0-ba4e-a03063c774dc.json

@@ -11,4 +11,4 @@
     "nodes": null
   },
   "state": "choose_method"
-}
+}

persistence/sql/migratest/fixtures/recovery_token/1b667e6d-8fda-4194-a765-08185185d7e4.json

@@ -3,4 +3,4 @@
   "recovery_address": null,
   "expires_at": "2013-10-07T08:23:19Z",
   "issued_at": "2013-10-07T08:23:19Z"
-}
+}

persistence/sql/migratest/fixtures/recovery_token/5529d454-2946-404e-b681-d950f8657fd0.json

@@ -3,4 +3,4 @@
   "recovery_address": null,
   "expires_at": "2000-01-01T00:00:00Z",
   "issued_at": "2000-01-01T00:00:00Z"
-}
+}

persistence/sql/migratest/fixtures/recovery_token/77ca3f5c-cd39-488b-9f1d-cc7166d14bdc.json

@@ -3,4 +3,4 @@
   "recovery_address": null,
   "expires_at": "2000-01-01T00:00:00Z",
   "issued_at": "2000-01-01T00:00:00Z"
-}
+}

persistence/sql/migratest/fixtures/registration_flow/05a7f09d-4ef3-41fb-958a-6ad74584b36a.json

@@ -9,4 +9,4 @@
     "method": "",
     "nodes": null
   }
-}
+}

persistence/sql/migratest/fixtures/registration_flow/22d58184-b97d-44a5-bbaf-0aa8b4000d81.json

@@ -9,4 +9,4 @@
     "method": "",
     "nodes": null
   }
-}
+}

persistence/sql/migratest/fixtures/registration_flow/2bf132e0-5d40-4df9-9a11-9106e5333735.json

@@ -9,4 +9,4 @@
     "method": "",
     "nodes": null
   }
-}
+}

persistence/sql/migratest/fixtures/registration_flow/696e7022-c466-44f6-89c6-8cf93c06a62a.json

@@ -10,4 +10,4 @@
     "method": "",
     "nodes": null
   }
-}
+}