Skip to content

Commit d6aeca3

Browse files
committed
Merge remote-tracking branch 'origin/main' into benjcooley/vue-nodes-viewport-culling
2 parents b3dddb7 + 4cd7e00 commit d6aeca3

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,22 @@ test.describe('Vue Nodes Canvas Pan', { tag: '@vue-nodes' }, () => {
205205
'@mobile Can pan with touch',
206206
{ tag: '@screenshot' },
207207
async ({ comfyPage }) => {
208+
const offsetBefore = await comfyPage.canvasOps.getOffset()
209+
208210
await comfyPage.canvasOps.panWithTouch(
209211
{ x: 64, y: 64 },
210212
{ x: 256, y: 256 }
211213
)
214+
215+
// Fail on a pan that never landed here, not as a screenshot diff.
216+
await expect
217+
.poll(() => comfyPage.canvasOps.getOffset())
218+
.not.toEqual(offsetBefore)
219+
220+
// Tolerates text anti-aliasing noise in the widget value text.
212221
await expect(comfyPage.canvas).toHaveScreenshot(
213-
'vue-nodes-paned-with-touch.png'
222+
'vue-nodes-paned-with-touch.png',
223+
{ maxDiffPixels: 100 }
214224
)
215225
}
216226
)

src/platform/workspace/composables/useSubscriptionCheckout.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ describe('useSubscriptionCheckout', () => {
450450

451451
it.for([
452452
['SUBSCRIPTION_PAYMENT_REQUIRED', null],
453+
['OUTSTANDING_PAYMENT_REQUIRED', null],
453454
['TRANSITION_NOT_ALLOWED', 'payment_failed']
454455
] as const)(
455456
'routes %s previews to the billing portal',

src/platform/workspace/composables/useSubscriptionCheckout.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,9 @@ export function useSubscriptionCheckout(
300300
error: unknown,
301301
isCurrent: () => boolean = () => true
302302
) {
303-
let requiresRecovery = hasErrorCode(error, 'SUBSCRIPTION_PAYMENT_REQUIRED')
303+
let requiresRecovery =
304+
hasErrorCode(error, 'SUBSCRIPTION_PAYMENT_REQUIRED') ||
305+
hasErrorCode(error, 'OUTSTANDING_PAYMENT_REQUIRED')
304306
if (!requiresRecovery && hasErrorCode(error, 'TRANSITION_NOT_ALLOWED')) {
305307
try {
306308
requiresRecovery =

0 commit comments

Comments
 (0)