test: resolve regressions

ory · Oct 19, 2021 · 1a93b2f · 1a93b2f
1 parent 3f06738
commit 1a93b2f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/selfservice/strategy/password/settings_test.go b/selfservice/strategy/password/settings_test.go
@@ -223,12 +223,12 @@ func TestSettings(t *testing.T) {
 
 		t.Run("type=api", func(t *testing.T) {
 			actual := testhelpers.SubmitSettingsForm(t, true, false, apiUser1, publicTS, payload, http.StatusOK, publicTS.URL+settings.RouteSubmitFlow)
-			check(t, gjson.Get(actual, "flow").Raw)
+			check(t, actual)
 		})
 
 		t.Run("type=spa", func(t *testing.T) {
 			actual := testhelpers.SubmitSettingsForm(t, false, true, browserUser1, publicTS, payload, http.StatusOK, publicTS.URL+settings.RouteSubmitFlow)
-			check(t, gjson.Get(actual, "flow").Raw)
+			check(t, actual)
 		})
 
 		t.Run("type=browser", func(t *testing.T) {
@@ -338,12 +338,12 @@ func TestSettings(t *testing.T) {
 
 		t.Run("type=api", func(t *testing.T) {
 			actual := expectSuccess(t, true, false, apiUser2, payload)
-			check(t, gjson.Get(actual, "flow").Raw, apiIdentity2)
+			check(t, actual, apiIdentity2)
 		})
 
 		t.Run("type=spa", func(t *testing.T) {
 			actual := expectSuccess(t, false, true, browserUser2, payload)
-			check(t, gjson.Get(actual, "flow").Raw, browserIdentity2)
+			check(t, actual, browserIdentity2)
 		})
 
 		t.Run("type=browser", func(t *testing.T) {

diff --git a/selfservice/strategy/profile/strategy_test.go b/selfservice/strategy/profile/strategy_test.go
@@ -446,12 +446,12 @@ func TestStrategyTraits(t *testing.T) {
 
 		t.Run("type=api", func(t *testing.T) {
 			actual := expectSuccess(t, true, false, apiUser1, payload("not-john-doe-api@mail.com"))
-			check(t, gjson.Get(actual, "flow").Raw)
+			check(t, actual)
 		})
 
 		t.Run("type=sqa", func(t *testing.T) {
 			actual := expectSuccess(t, false, true, browserUser1, payload("not-john-doe-browser@mail.com"))
-			check(t, gjson.Get(actual, "flow").Raw)
+			check(t, actual)
 		})
 
 		t.Run("type=browser", func(t *testing.T) {
@@ -544,13 +544,13 @@ func TestStrategyTraits(t *testing.T) {
 		t.Run("type=api", func(t *testing.T) {
 			newEmail := "update-verify-api@mail.com"
 			actual := expectSuccess(t, true, false, apiUser1, payload(newEmail))
-			check(t, gjson.Get(actual, "flow").Raw, newEmail)
+			check(t, actual, newEmail)
 		})
 
 		t.Run("type=spa", func(t *testing.T) {
 			newEmail := "update-verify-browser@mail.com"
 			actual := expectSuccess(t, false, true, browserUser1, payload(newEmail))
-			check(t, gjson.Get(actual, "flow").Raw, newEmail)
+			check(t, actual, newEmail)
 		})
 
 		t.Run("type=browser", func(t *testing.T) {
@@ -583,14 +583,14 @@ func TestStrategyTraits(t *testing.T) {
 			setPrivilegedTime(t, time.Second*10)
 			email := "not-john-doe-api@mail.com"
 			actual := expectSuccess(t, true, false, apiUser1, payload(email))
-			check(t, email, gjson.Get(actual, "flow").Raw)
+			check(t, email, actual)
 		})
 
 		t.Run("type=sqa", func(t *testing.T) {
 			setPrivilegedTime(t, time.Second*10)
 			email := "not-john-doe-browser@mail.com"
 			actual := expectSuccess(t, false, true, browserUser1, payload(email))
-			check(t, email, gjson.Get(actual, "flow").Raw)
+			check(t, email, actual)
 		})
 
 		t.Run("type=browser", func(t *testing.T) {

diff --git a/selfservice/strategy/totp/fixtures/settings/totp_setup.json b/selfservice/strategy/totp/fixtures/settings/totp_setup.json
@@ -55,8 +55,10 @@
   },
   {
     "attributes": {
+      "height": 256,
       "id": "totp_qr",
-      "src": "data:image/png;base64,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"
+      "src": "data:image/png;base64,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",
+      "width": 256
     },
     "group": "totp",
     "messages": [],

diff --git a/selfservice/strategy/webauthn/settings_test.go b/selfservice/strategy/webauthn/settings_test.go
@@ -313,11 +313,10 @@ func TestCompleteSettings(t *testing.T) {
 
 			if spa {
 				assert.Contains(t, res.Request.URL.String(), publicTS.URL+settings.RouteSubmitFlow)
-				assert.EqualValues(t, settings.StateSuccess, gjson.Get(body, "flow.state").String(), body)
 			} else {
 				assert.Contains(t, res.Request.URL.String(), uiTS.URL)
-				assert.EqualValues(t, settings.StateSuccess, gjson.Get(body, "state").String(), body)
 			}
+			assert.EqualValues(t, settings.StateSuccess, gjson.Get(body, "state").String(), body)
 
 			actual, err := reg.Persister().GetIdentityConfidential(context.Background(), id.ID)
 			require.NoError(t, err)