diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Charge.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Charge.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Charge.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Charge.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Charge.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Charge.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Charge.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Charge.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.modify.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.modify.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.modify.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.modify.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.modify.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.modify.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.modify.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.modify.3.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.modify.3.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.modify.3.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.modify.3.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.retrieve.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Customer.retrieve.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Customer.retrieve.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.3.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.3.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.3.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.4.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.4.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.4.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.5.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.5.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.5.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.6.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.6.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.6.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.6.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.7.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.7.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.7.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.7.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.8.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.8.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.8.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.8.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.9.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.9.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Event.list.9.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Event.list.9.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.finalize_invoice.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.finalize_invoice.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.finalize_invoice.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.3.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.3.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.3.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.3.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.4.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.4.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--Invoice.list.4.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--Invoice.list.4.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--InvoiceItem.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--InvoiceItem.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--InvoiceItem.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--InvoiceItem.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--InvoiceItem.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--InvoiceItem.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--InvoiceItem.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--InvoiceItem.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--InvoiceItem.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--InvoiceItem.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.confirm.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.confirm.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.confirm.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.confirm.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.confirm.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.confirm.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.confirm.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.confirm.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentIntent.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentIntent.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentMethod.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentMethod.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentMethod.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentMethod.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentMethod.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentMethod.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--PaymentMethod.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--PaymentMethod.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.retrieve.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.retrieve.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.retrieve.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.retrieve.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--SetupIntent.retrieve.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--SetupIntent.retrieve.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_begining--checkout.Session.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_restart_from_beginning--checkout.Session.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Charge.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Charge.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Charge.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Charge.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Charge.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Charge.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Charge.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Charge.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.modify.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.modify.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.modify.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.modify.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.modify.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.modify.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.modify.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.modify.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.modify.3.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.modify.3.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.modify.3.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.modify.3.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.retrieve.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Customer.retrieve.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Customer.retrieve.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.3.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.3.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.3.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.3.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.4.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.4.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.4.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.4.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.5.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.5.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.5.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.5.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.6.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.6.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.6.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.6.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.7.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.7.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.7.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.7.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.8.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.8.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.8.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.8.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.9.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.9.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Event.list.9.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Event.list.9.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.finalize_invoice.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.finalize_invoice.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.finalize_invoice.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.finalize_invoice.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.3.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.3.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.3.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.3.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.4.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.4.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--Invoice.list.4.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--Invoice.list.4.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--InvoiceItem.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--InvoiceItem.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--InvoiceItem.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--InvoiceItem.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--InvoiceItem.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--InvoiceItem.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--InvoiceItem.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--InvoiceItem.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--InvoiceItem.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--InvoiceItem.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--InvoiceItem.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--InvoiceItem.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.confirm.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.confirm.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.confirm.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.confirm.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.confirm.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.confirm.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.confirm.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.confirm.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.retrieve.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.retrieve.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.retrieve.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.retrieve.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentIntent.retrieve.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentIntent.retrieve.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentMethod.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentMethod.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentMethod.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentMethod.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentMethod.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentMethod.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--PaymentMethod.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--PaymentMethod.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.list.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.retrieve.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.retrieve.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.retrieve.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.retrieve.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.retrieve.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--SetupIntent.retrieve.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--SetupIntent.retrieve.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.create.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.create.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.create.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.create.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.create.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.create.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.create.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.create.2.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.list.1.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.list.1.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.list.1.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.list.1.json diff --git a/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.list.2.json b/corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.list.2.json similarity index 100% rename from corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining--checkout.Session.list.2.json rename to corporate/tests/stripe_fixtures/upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning--checkout.Session.list.2.json diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py index 901507c6f0..9159a1fb7f 100644 --- a/corporate/tests/test_stripe.py +++ b/corporate/tests/test_stripe.py @@ -1482,7 +1482,7 @@ class StripeTest(StripeTestCase): self.assertEqual(ledger_entry.licenses_at_next_renewal, new_seat_count) @mock_stripe() - def test_upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining( + def test_upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning( self, *mocks: Mock ) -> None: user = self.example_user("hamlet") @@ -1652,7 +1652,7 @@ class StripeTest(StripeTestCase): self.assertEqual("/billing/", response["Location"]) @mock_stripe() - def test_upgrade_first_card_fails_and_restart_from_begining(self, *mocks: Mock) -> None: + def test_upgrade_first_card_fails_and_restart_from_beginning(self, *mocks: Mock) -> None: user = self.example_user("hamlet") self.login_user(user) # From https://stripe.com/docs/testing#cards: Attaching this card to diff --git a/docs/subsystems/input-pills.md b/docs/subsystems/input-pills.md index 6d0cb0ac38..47448e21bc 100644 --- a/docs/subsystems/input-pills.md +++ b/docs/subsystems/input-pills.md @@ -18,7 +18,7 @@ The pills will automatically be inserted in before the ".input" in order. ## Basic usage ```js -var $pill_containter = $("#input_container"); +var $pill_container = $("#input_container"); var pills = input_pill.create({ $container: $pill_container, create_item_from_text: user_pill.create_item_from_email, diff --git a/docs/testing/mypy.md b/docs/testing/mypy.md index 45964579fc..681f6d00ea 100644 --- a/docs/testing/mypy.md +++ b/docs/testing/mypy.md @@ -185,7 +185,7 @@ class FooTestCase(ZulipTestCase): ``` We sometimes encounter innaccurate type annotations in the Django -stubs project. We prefer to address these by [submiting a pull +stubs project. We prefer to address these by [submitting a pull request](https://github.com/typeddjango/django-stubs/pulls) to fix the issue in the upstream project, just like we do with `typeshed` bugs. diff --git a/docs/translating/finnish.md b/docs/translating/finnish.md index b9e9c00db3..7d1f6a74fd 100644 --- a/docs/translating/finnish.md +++ b/docs/translating/finnish.md @@ -127,7 +127,7 @@ Use commas in whole sentences where it is required. You can use these instructio - Subscribe a stream - **Tilaa kanava** - Subdomain - **Aliverkkotunnus** - Shortcuts - **Pikanäppäimet** -- Unsubscripe - **Peru tilaus** +- Unsubscribe - **Peru tilaus** - Unsupported - **Ei-tuettu** - Unresolve - **Merkitse ratkaisemattomaksi** - Webhook - **Webhook** diff --git a/frontend_tests/node_tests/pm_list_data.js b/frontend_tests/node_tests/pm_list_data.js index 2ded2ecd96..a98db5b4be 100644 --- a/frontend_tests/node_tests/pm_list_data.js +++ b/frontend_tests/node_tests/pm_list_data.js @@ -299,7 +299,7 @@ test("get_list_info", ({override}) => { more_conversations_unread_count: 0, }); - // Now, add additional converstaions until we exceed + // Now, add additional conversations until we exceed // `max_conversations_to_show_with_unreads`. pm_conversations.recent.insert([zoe.user_id], 3); diff --git a/frontend_tests/node_tests/typeahead_helper.js b/frontend_tests/node_tests/typeahead_helper.js index 3065d2f811..c657705c8f 100644 --- a/frontend_tests/node_tests/typeahead_helper.js +++ b/frontend_tests/node_tests/typeahead_helper.js @@ -265,7 +265,7 @@ test("sort_languages", () => { Object.assign(pygments_data, { langs: { python: {priority: 26}, - javscript: {priority: 27}, + javascript: {priority: 27}, php: {priority: 16}, pascal: {priority: 15}, perl: {priority: 3}, diff --git a/scripts/setup/inline_email_css.py b/scripts/setup/inline_email_css.py index 927158284e..878e2e70df 100755 --- a/scripts/setup/inline_email_css.py +++ b/scripts/setup/inline_email_css.py @@ -59,7 +59,7 @@ def inline_template(template_source_name: str) -> None: # Thus, we strip this stuff out if the template extends # another template. if template_name not in ["email_base_default", "email_base_marketing", "macros"]: - output = strip_unnecesary_tags(output) + output = strip_unnecessary_tags(output) if ( "zerver/emails/compiled/email_base_default.html" in output @@ -82,7 +82,7 @@ def escape_jinja2_characters(text: str) -> str: return text -def strip_unnecesary_tags(text: str) -> str: +def strip_unnecessary_tags(text: str) -> str: end_block = "\n" start_block = "{% extends" start = text.find(start_block) diff --git a/static/js/dialog_widget.js b/static/js/dialog_widget.js index 02d31c71f5..7b74bd403a 100644 --- a/static/js/dialog_widget.js +++ b/static/js/dialog_widget.js @@ -181,10 +181,10 @@ export function submit_api_request( request_method({ url, data, - success(reponse_data) { + success(response_data) { close_modal(); if (success_continuation !== undefined) { - success_continuation(reponse_data); + success_continuation(response_data); } }, error(xhr) { diff --git a/static/js/giphy.js b/static/js/giphy.js index 9113f2c2e5..71865a99b4 100644 --- a/static/js/giphy.js +++ b/static/js/giphy.js @@ -20,7 +20,7 @@ let $active_popover_element; // Only used if popover called from edit message, otherwise it is `undefined`. let edit_message_id; -export function is_popped_from_edit_messsage() { +export function is_popped_from_edit_message() { return $active_popover_element && edit_message_id !== undefined; } diff --git a/static/js/hotkey.js b/static/js/hotkey.js index 087e26a41b..7dbbf704a3 100644 --- a/static/js/hotkey.js +++ b/static/js/hotkey.js @@ -288,7 +288,7 @@ export function process_escape_key(e) { return true; } - if (giphy.is_popped_from_edit_messsage()) { + if (giphy.is_popped_from_edit_message()) { giphy.focus_current_edit_message(); // Hide after setting focus so that `edit_message_id` is // still set in giphy. @@ -299,7 +299,7 @@ export function process_escape_key(e) { if (compose_state.composing()) { // Check if the giphy popover was open using compose box. // Hide GIPHY popover if it's open. - if (!giphy.is_popped_from_edit_messsage() && giphy.hide_giphy_popover()) { + if (!giphy.is_popped_from_edit_message() && giphy.hide_giphy_popover()) { $("#compose-textarea").trigger("focus"); return true; } diff --git a/static/js/message_list_view.js b/static/js/message_list_view.js index a5dbf16444..48e021a5bf 100644 --- a/static/js/message_list_view.js +++ b/static/js/message_list_view.js @@ -539,7 +539,7 @@ export class MessageListView { return true; } - // We may need to add a subscripton marker after merging the groups. + // We may need to add a subscription marker after merging the groups. this.maybe_add_subscription_marker(second_group, last_msg_container, first_msg_container); return false; diff --git a/static/js/portico/signup.js b/static/js/portico/signup.js index dd99855a38..c420d26d97 100644 --- a/static/js/portico/signup.js +++ b/static/js/portico/signup.js @@ -184,7 +184,7 @@ $(() => { }, }); - function check_subdomain_avilable(subdomain) { + function check_subdomain_available(subdomain) { const url = "/json/realm/subdomain/" + subdomain; $.get(url, (response) => { if (response.msg !== "available") { @@ -223,7 +223,7 @@ $(() => { }); $("#id_team_subdomain").on("keyup", () => { clearTimeout(timer); - timer = setTimeout(check_subdomain_avilable, 250, $("#id_team_subdomain").val()); + timer = setTimeout(check_subdomain_available, 250, $("#id_team_subdomain").val()); }); // GitHub auth diff --git a/static/js/resize.js b/static/js/resize.js index 1bf2846b44..92f97ff5d7 100644 --- a/static/js/resize.js +++ b/static/js/resize.js @@ -15,7 +15,7 @@ function get_new_heights() { const res = {}; const viewport_height = message_viewport.height(); const top_navbar_height = $("#top_navbar").safeOuterHeight(true); - const right_sidebar_shorcuts_height = $(".right-sidebar-shortcuts").safeOuterHeight(true) || 0; + const right_sidebar_shortcuts_height = $(".right-sidebar-shortcuts").safeOuterHeight(true) || 0; res.bottom_whitespace_height = viewport_height * 0.4; @@ -39,7 +39,7 @@ function get_new_heights() { Number.parseInt($("#right-sidebar").css("marginTop"), 10) - $("#userlist-header").safeOuterHeight(true) - $("#user_search_section").safeOuterHeight(true) - - right_sidebar_shorcuts_height; + right_sidebar_shortcuts_height; res.buddy_list_wrapper_max_height = Math.max(80, usable_height); diff --git a/static/js/settings_org.js b/static/js/settings_org.js index 7a335dba6c..82ee57fec6 100644 --- a/static/js/settings_org.js +++ b/static/js/settings_org.js @@ -426,7 +426,7 @@ function set_org_join_restrictions_dropdown() { ); } -function set_message_content_in_email_notifications_visiblity() { +function set_message_content_in_email_notifications_visibility() { change_element_block_display_property( "message_content_in_email_notifications_label", page_params.realm_message_content_allowed_in_email_notifications, @@ -522,7 +522,7 @@ function update_dependent_subsettings(property_name) { set_org_join_restrictions_dropdown(); break; case "realm_message_content_allowed_in_email_notifications": - set_message_content_in_email_notifications_visiblity(); + set_message_content_in_email_notifications_visibility(); break; case "realm_digest_emails_enabled": settings_notifications.set_enable_digest_emails_visibility( @@ -1156,7 +1156,7 @@ export function build_page() { set_delete_own_message_policy_dropdown(page_params.realm_delete_own_message_policy); set_message_retention_setting_dropdown(); set_org_join_restrictions_dropdown(); - set_message_content_in_email_notifications_visiblity(); + set_message_content_in_email_notifications_visibility(); set_digest_emails_weekday_visibility(); set_create_web_public_stream_dropdown_visibility(); diff --git a/static/js/settings_ui.js b/static/js/settings_ui.js index e6aa5d443a..94e6daa95d 100644 --- a/static/js/settings_ui.js +++ b/static/js/settings_ui.js @@ -43,13 +43,13 @@ export function do_settings_change( request_method({ url, data, - success(reponse_data) { + success(response_data) { setTimeout(() => { ui_report.success(success_msg_html, $spinner, remove_after); display_checkmark($spinner); }, appear_after); if (success_continuation !== undefined) { - success_continuation(reponse_data); + success_continuation(response_data); } }, error(xhr) { diff --git a/static/templates/settings/notification_settings.hbs b/static/templates/settings/notification_settings.hbs index 8ba81e2b08..7582af23fd 100644 --- a/static/templates/settings/notification_settings.hbs +++ b/static/templates/settings/notification_settings.hbs @@ -2,7 +2,7 @@

{{t "Notification triggers" }}

- {{> settings_save_discard_widget section_name="general-notifiy-settings" show_only_indicator=(not for_realm_settings) }} + {{> settings_save_discard_widget section_name="general-notify-settings" show_only_indicator=(not for_realm_settings) }}

{{t "Configure how Zulip notifies you about new messages." }}

diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 72b19fc35d..8cb79565d9 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -174,23 +174,23 @@ if vendor == "debian" and os_version in [] or vendor == "ubuntu" and os_version *VENV_DEPENDENCIES, ] elif "debian" in os_families(): - DEBIAN_DEPENDECIES = UBUNTU_COMMON_APT_DEPENDENCIES + DEBIAN_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES # The below condition is required since libappindicator is # not available for Debian 11. "libgroonga1" is an # additional dependency for postgresql-13-pgdg-pgroonga. # # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037 if vendor == "debian" and os_version == "11": - DEBIAN_DEPENDECIES.remove("libappindicator1") - DEBIAN_DEPENDECIES.append("libgroonga0") + DEBIAN_DEPENDENCIES.remove("libappindicator1") + DEBIAN_DEPENDENCIES.append("libgroonga0") # If we are on an aarch64 processor, ninja will be built from source, # so cmake is required if platform.machine() == "aarch64": - DEBIAN_DEPENDECIES.append("cmake") + DEBIAN_DEPENDENCIES.append("cmake") SYSTEM_DEPENDENCIES = [ - *DEBIAN_DEPENDECIES, + *DEBIAN_DEPENDENCIES, f"postgresql-{POSTGRESQL_VERSION}", f"postgresql-{POSTGRESQL_VERSION}-pgroonga", *VENV_DEPENDENCIES, @@ -355,8 +355,8 @@ def main(options: argparse.Namespace) -> NoReturn: # hash the apt dependencies sha_sum = hashlib.sha1() - for apt_depedency in SYSTEM_DEPENDENCIES: - sha_sum.update(apt_depedency.encode()) + for apt_dependency in SYSTEM_DEPENDENCIES: + sha_sum.update(apt_dependency.encode()) if "debian" in os_families(): with open("scripts/lib/setup-apt-repo", "rb") as fb: sha_sum.update(fb.read()) diff --git a/zerver/lib/event_schema.py b/zerver/lib/event_schema.py index 5b34087f36..731a5c5a12 100644 --- a/zerver/lib/event_schema.py +++ b/zerver/lib/event_schema.py @@ -287,7 +287,7 @@ heartbeat_event = event_dict_type( ("type", Equals("heartbeat")), ] ) -_check_hearbeat = make_checker(heartbeat_event) +_check_heartbeat = make_checker(heartbeat_event) def check_heartbeat( @@ -295,7 +295,7 @@ def check_heartbeat( var_name: str, event: Dict[str, object], ) -> None: - _check_hearbeat(var_name, event) + _check_heartbeat(var_name, event) _hotspot = DictType( diff --git a/zerver/lib/export.py b/zerver/lib/export.py index db32625a27..80970da2cc 100644 --- a/zerver/lib/export.py +++ b/zerver/lib/export.py @@ -620,12 +620,12 @@ def export_from_config( assert parent.table is not None assert config.include_rows is not None parent_ids = [r["id"] for r in response[parent.table]] - filter_parms: Dict[str, Any] = {config.include_rows: parent_ids} + filter_params: Dict[str, Any] = {config.include_rows: parent_ids} if config.filter_args is not None: - filter_parms.update(config.filter_args) + filter_params.update(config.filter_args) assert model is not None try: - query = model.objects.filter(**filter_parms) + query = model.objects.filter(**filter_params) except Exception: print( f""" @@ -635,7 +635,7 @@ def export_from_config( table: {table} parent: {parent.table} - filter_parms: {filter_parms} + filter_params: {filter_params} """ ) raise @@ -654,10 +654,10 @@ def export_from_config( if config.source_filter: child_rows = [r for r in child_rows if config.source_filter(r)] lookup_ids = [r[field] for r in child_rows] - filter_parms = dict(id__in=lookup_ids) + filter_params = dict(id__in=lookup_ids) if config.filter_args: - filter_parms.update(config.filter_args) - query = model.objects.filter(**filter_parms) + filter_params.update(config.filter_args) + query = model.objects.filter(**filter_params) rows = list(query) if rows is not None: diff --git a/zerver/lib/push_notifications.py b/zerver/lib/push_notifications.py index 3852813fdc..7ee933f9c1 100644 --- a/zerver/lib/push_notifications.py +++ b/zerver/lib/push_notifications.py @@ -59,7 +59,7 @@ def hex_to_b64(data: str) -> str: return base64.b64encode(bytes.fromhex(data)).decode() -class UserPushIndentityCompat: +class UserPushIdentityCompat: """Compatibility class for supporting the transition from remote servers sending their UserProfile ids to the bouncer to sending UserProfile uuids instead. @@ -100,7 +100,7 @@ class UserPushIndentityCompat: return result def __eq__(self, other: Any) -> bool: - if isinstance(other, UserPushIndentityCompat): + if isinstance(other, UserPushIdentityCompat): return self.user_id == other.user_id and self.user_uuid == other.user_uuid return False @@ -181,7 +181,7 @@ APNS_MAX_RETRIES = 3 @statsd_increment("apple_push_notification") def send_apple_push_notification( - user_identity: UserPushIndentityCompat, + user_identity: UserPushIdentityCompat, devices: Sequence[DeviceToken], payload_data: Mapping[str, Any], remote: Optional["RemoteZulipServer"] = None, @@ -307,7 +307,7 @@ def send_android_push_notification_to_user( ) -> None: devices = list(PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.GCM)) send_android_push_notification( - UserPushIndentityCompat(user_id=user_profile.id), devices, data, options + UserPushIdentityCompat(user_id=user_profile.id), devices, data, options ) @@ -358,7 +358,7 @@ def parse_gcm_options(options: Dict[str, Any], data: Dict[str, Any]) -> str: @statsd_increment("android_push_notification") def send_android_push_notification( - user_identity: UserPushIndentityCompat, + user_identity: UserPushIdentityCompat, devices: Sequence[DeviceToken], data: Dict[str, Any], options: Dict[str, Any], @@ -1009,7 +1009,7 @@ def handle_remove_push_notification(user_profile_id: int, message_ids: List[int] if uses_notification_bouncer(): send_notifications_to_bouncer(user_profile_id, apns_payload, gcm_payload, gcm_options) else: - user_identity = UserPushIndentityCompat(user_id=user_profile_id) + user_identity = UserPushIdentityCompat(user_id=user_profile_id) android_devices = list( PushDeviceToken.objects.filter(user=user_profile, kind=PushDeviceToken.GCM) ) @@ -1145,6 +1145,6 @@ def handle_push_notification(user_profile_id: int, missed_message: Dict[str, Any len(android_devices), len(apple_devices), ) - user_identity = UserPushIndentityCompat(user_id=user_profile.id) + user_identity = UserPushIdentityCompat(user_id=user_profile.id) send_apple_push_notification(user_identity, apple_devices, apns_payload) send_android_push_notification(user_identity, android_devices, gcm_payload, gcm_options) diff --git a/zerver/lib/request.py b/zerver/lib/request.py index 120720ad01..6e4986f347 100644 --- a/zerver/lib/request.py +++ b/zerver/lib/request.py @@ -78,7 +78,7 @@ class RequestNotes(BaseNotes[HttpRequest, "RequestNotes"]): return RequestNotes() -class RequestConfusingParmsError(JsonableError): +class RequestConfusingParamsError(JsonableError): code = ErrorCode.REQUEST_CONFUSING_VAR data_fields = ["var_name1", "var_name2"] @@ -413,7 +413,7 @@ def has_request_variables( # fails to recognize this for some reason. continue # nocoverage if post_var_name is not None: - raise RequestConfusingParmsError(post_var_name, req_var) + raise RequestConfusingParamsError(post_var_name, req_var) post_var_name = req_var if post_var_name is None: diff --git a/zerver/migrations/0277_migrate_alert_word.py b/zerver/migrations/0277_migrate_alert_word.py index 19ddc10753..c87bd4655c 100644 --- a/zerver/migrations/0277_migrate_alert_word.py +++ b/zerver/migrations/0277_migrate_alert_word.py @@ -6,7 +6,7 @@ from django.db.backends.postgresql.schema import BaseDatabaseSchemaEditor from django.db.migrations.state import StateApps -def move_to_seperate_table(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None: +def move_to_separate_table(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None: UserProfile = apps.get_model("zerver", "UserProfile") AlertWord = apps.get_model("zerver", "AlertWord") @@ -48,5 +48,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(move_to_seperate_table, move_back_to_user_profile, elidable=True), + migrations.RunPython(move_to_separate_table, move_back_to_user_profile, elidable=True), ] diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 359f0e6873..31070289fb 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -10013,7 +10013,7 @@ paths: zulip_merge_base: type: string description: | - The `git merge-base` between `zulip_verson` and official branches + The `git merge-base` between `zulip_version` and official branches in the public [Zulip server and web app repository](https://github.com/zulip/zulip), in the same format as `zulip_version`. This will equal @@ -13409,7 +13409,7 @@ paths: zulip_merge_base: type: string description: | - The `git merge-base` between `zulip_verson` and official branches + The `git merge-base` between `zulip_version` and official branches in the public [Zulip server and web app repository](https://github.com/zulip/zulip), in the same format as `zulip_version`. This will equal diff --git a/zerver/tests/fixtures/markdown_test_cases.json b/zerver/tests/fixtures/markdown_test_cases.json index 58de3fc853..edee732e85 100644 --- a/zerver/tests/fixtures/markdown_test_cases.json +++ b/zerver/tests/fixtures/markdown_test_cases.json @@ -537,7 +537,7 @@ "translate_emoticons": true }, { - "name": "translate_emoticons_whitepsace", + "name": "translate_emoticons_whitespace", "input": "a:) ;)b", "expected_output": "

a:) ;)b

", "text_content": "a:) ;)b", diff --git a/zerver/tests/test_audit_log.py b/zerver/tests/test_audit_log.py index cf6121cf8a..6678e55773 100644 --- a/zerver/tests/test_audit_log.py +++ b/zerver/tests/test_audit_log.py @@ -771,7 +771,7 @@ class TestRealmAuditLog(ZulipTestCase): def test_realm_playground_entries(self) -> None: user = self.example_user("iago") - intial_playgrounds = get_realm_playgrounds(user.realm) + initial_playgrounds = get_realm_playgrounds(user.realm) now = timezone_now() playground_id = do_add_realm_playground( user.realm, @@ -787,7 +787,7 @@ class TestRealmAuditLog(ZulipTestCase): url_prefix="https://python.example.com", ) expected_extra_data = { - "realm_playgrounds": intial_playgrounds + [added_playground], + "realm_playgrounds": initial_playgrounds + [added_playground], "added_playground": added_playground, } self.assertEqual( @@ -814,7 +814,7 @@ class TestRealmAuditLog(ZulipTestCase): "url_prefix": "https://python.example.com", } expected_extra_data = { - "realm_playgrounds": intial_playgrounds, + "realm_playgrounds": initial_playgrounds, "removed_playground": removed_playground, } self.assertEqual( @@ -830,7 +830,7 @@ class TestRealmAuditLog(ZulipTestCase): def test_realm_linkifier_entries(self) -> None: user = self.example_user("iago") - intial_linkifiers = linkifiers_for_realm(user.realm.id) + initial_linkifiers = linkifiers_for_realm(user.realm.id) now = timezone_now() linkifier_id = do_add_linkifier( user.realm, @@ -845,7 +845,7 @@ class TestRealmAuditLog(ZulipTestCase): id=linkifier_id, ) expected_extra_data = { - "realm_linkifiers": intial_linkifiers + [added_linkfier], + "realm_linkifiers": initial_linkifiers + [added_linkfier], "added_linkifier": added_linkfier, } self.assertEqual( @@ -873,7 +873,7 @@ class TestRealmAuditLog(ZulipTestCase): id=linkifier_id, ) expected_extra_data = { - "realm_linkifiers": intial_linkifiers + [changed_linkifier], + "realm_linkifiers": initial_linkifiers + [changed_linkifier], "changed_linkifier": changed_linkifier, } self.assertEqual( @@ -898,7 +898,7 @@ class TestRealmAuditLog(ZulipTestCase): "url_format": "https://realm.com/my_realm_filter/issues/%(id)s", } expected_extra_data = { - "realm_linkifiers": intial_linkifiers, + "realm_linkifiers": initial_linkifiers, "removed_linkifier": removed_linkifier, } self.assertEqual( diff --git a/zerver/tests/test_bots.py b/zerver/tests/test_bots.py index 3b53cc017c..a06b0b79b0 100644 --- a/zerver/tests/test_bots.py +++ b/zerver/tests/test_bots.py @@ -316,7 +316,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin): def test_add_bot_email_address_visibility(self) -> None: # Test that we don't mangle the email field with - # email_address_visiblity limited to admins + # email_address_visibility limited to admins user = self.example_user("hamlet") do_set_realm_property( user.realm, diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py index c1bfd818ee..73de336412 100644 --- a/zerver/tests/test_decorators.py +++ b/zerver/tests/test_decorators.py @@ -49,7 +49,7 @@ from zerver.lib.initial_password import initial_password from zerver.lib.rate_limiter import is_local_addr from zerver.lib.request import ( REQ, - RequestConfusingParmsError, + RequestConfusingParamsError, RequestNotes, RequestVariableConversionError, RequestVariableMissingError, @@ -183,7 +183,7 @@ class DecoratorTestCase(ZulipTestCase): self.assertEqual(orjson.loads(double(request).content).get("number"), 10) request = HostRequestMock(post_data={"number": "6", "x": "7"}) - with self.assertRaises(RequestConfusingParmsError) as cm: + with self.assertRaises(RequestConfusingParamsError) as cm: double(request) self.assertEqual(str(cm.exception), "Can't decide between 'number' and 'x' arguments") diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 7d78581be6..415c9d5d1d 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -1479,7 +1479,7 @@ class NormalActionsTest(BaseAction): ) check_realm_user_update("events[0]", events[0], "full_name") - def test_change_user_delivery_email_email_address_visibilty_admins(self) -> None: + def test_change_user_delivery_email_email_address_visibility_admins(self) -> None: do_set_realm_property( self.user_profile.realm, "email_address_visibility", diff --git a/zerver/tests/test_logging_handlers.py b/zerver/tests/test_logging_handlers.py index c8fc6dba74..ae0c4591c8 100644 --- a/zerver/tests/test_logging_handlers.py +++ b/zerver/tests/test_logging_handlers.py @@ -129,7 +129,7 @@ class AdminNotifyHandlerTest(ZulipTestCase): """A request with no stack and multi-line report.getMessage() is handled properly""" record = self.simulate_error() record.exc_info = None - record.msg = "message\nmoremesssage\nmore" + record.msg = "message\nmoremessage\nmore" report = self.run_handler(record) self.assertIn("user", report) @@ -138,7 +138,7 @@ class AdminNotifyHandlerTest(ZulipTestCase): self.assertIn("user_role", report["user"]) self.assertIn("message", report) self.assertIn("stack_trace", report) - self.assertEqual(report["stack_trace"], "message\nmoremesssage\nmore") + self.assertEqual(report["stack_trace"], "message\nmoremessage\nmore") self.assertEqual(report["message"], "message") @patch("zerver.logging_handlers.try_git_describe") diff --git a/zerver/tests/test_message_flags.py b/zerver/tests/test_message_flags.py index 2bb78a3dc9..45ed18690f 100644 --- a/zerver/tests/test_message_flags.py +++ b/zerver/tests/test_message_flags.py @@ -148,11 +148,11 @@ class FirstUnreadAnchorTests(ZulipTestCase): "zerver.lib.narrow.get_first_visible_message_id", return_value=new_message_id + 1, ): - messages_reponse = self.get_messages_response( + messages_response = self.get_messages_response( anchor="first_unread", num_before=0, num_after=1 ) - self.assert_length(messages_reponse["messages"], 0) - self.assertIn("anchor", messages_reponse) + self.assert_length(messages_response["messages"], 0) + self.assertIn("anchor", messages_response) with mock.patch( "zerver.lib.narrow.get_first_visible_message_id", diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py index 99a6ed83dc..b32db459f1 100644 --- a/zerver/tests/test_presence.py +++ b/zerver/tests/test_presence.py @@ -479,7 +479,7 @@ class UserPresenceAggregationTests(ZulipTestCase): }, ) - def test_aggregated_presense_active(self) -> None: + def test_aggregated_presence_active(self) -> None: user = self.example_user("othello") validate_time = timezone_now() result_dict = self._send_presence_for_aggregated_tests(user, "active", validate_time) @@ -491,7 +491,7 @@ class UserPresenceAggregationTests(ZulipTestCase): }, ) - def test_aggregated_presense_idle(self) -> None: + def test_aggregated_presence_idle(self) -> None: user = self.example_user("othello") validate_time = timezone_now() result_dict = self._send_presence_for_aggregated_tests(user, "idle", validate_time) @@ -503,7 +503,7 @@ class UserPresenceAggregationTests(ZulipTestCase): }, ) - def test_aggregated_presense_mixed(self) -> None: + def test_aggregated_presence_mixed(self) -> None: user = self.example_user("othello") self.login_user(user) validate_time = timezone_now() @@ -526,7 +526,7 @@ class UserPresenceAggregationTests(ZulipTestCase): }, ) - def test_aggregated_presense_offline(self) -> None: + def test_aggregated_presence_offline(self) -> None: user = self.example_user("othello") self.login_user(user) validate_time = timezone_now() diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py index 93d07053d0..fab9bc5c06 100644 --- a/zerver/tests/test_push_notifications.py +++ b/zerver/tests/test_push_notifications.py @@ -31,7 +31,7 @@ from zerver.lib.exceptions import JsonableError from zerver.lib.push_notifications import ( APNsContext, DeviceToken, - UserPushIndentityCompat, + UserPushIdentityCompat, b64_to_hex, get_apns_badge_count, get_apns_badge_count_future, @@ -360,7 +360,7 @@ class PushBouncerNotificationTest(BouncerTestCase): ], ) - user_identity = UserPushIndentityCompat(user_id=hamlet.id) + user_identity = UserPushIdentityCompat(user_id=hamlet.id) apple_push.assert_called_once_with( user_identity, [apple_token], @@ -1282,7 +1282,7 @@ class HandlePushNotificationTest(PushNotificationTest): ) as mock_push_notifications: handle_push_notification(self.user_profile.id, missed_message) - user_identity = UserPushIndentityCompat(user_id=self.user_profile.id) + user_identity = UserPushIdentityCompat(user_id=self.user_profile.id) mock_send_apple.assert_called_with(user_identity, apple_devices, {"apns": True}) mock_send_android.assert_called_with(user_identity, android_devices, {"gcm": True}, {}) mock_push_notifications.assert_called_once() @@ -1364,7 +1364,7 @@ class HandlePushNotificationTest(PushNotificationTest): ) as mock_send_apple: handle_remove_push_notification(self.user_profile.id, [message.id]) mock_push_notifications.assert_called_once() - user_identity = UserPushIndentityCompat(user_id=self.user_profile.id) + user_identity = UserPushIdentityCompat(user_id=self.user_profile.id) mock_send_android.assert_called_with( user_identity, android_devices, @@ -1492,7 +1492,7 @@ class HandlePushNotificationTest(PushNotificationTest): ) as mock_push_notifications: handle_push_notification(self.user_profile.id, missed_message) mock_logger.assert_not_called() - user_identity = UserPushIndentityCompat(user_id=self.user_profile.id) + user_identity = UserPushIdentityCompat(user_id=self.user_profile.id) mock_send_apple.assert_called_with(user_identity, apple_devices, {"apns": True}) mock_send_android.assert_called_with(user_identity, android_devices, {"gcm": True}, {}) mock_push_notifications.assert_called_once() @@ -1591,7 +1591,7 @@ class TestAPNs(PushNotificationTest): payload_data: Mapping[str, Any] = {}, ) -> None: send_apple_push_notification( - UserPushIndentityCompat(user_id=self.user_profile.id), + UserPushIdentityCompat(user_id=self.user_profile.id), devices if devices is not None else self.devices(), payload_data, ) @@ -2764,20 +2764,20 @@ class PushBouncerSignupTest(ZulipTestCase): ) -class TestUserPushIndentityCompat(ZulipTestCase): +class TestUserPushIdentityCompat(ZulipTestCase): def test_filter_q(self) -> None: - user_identity_id = UserPushIndentityCompat(user_id=1) - user_identity_uuid = UserPushIndentityCompat(user_uuid="aaaa") - user_identity_both = UserPushIndentityCompat(user_id=1, user_uuid="aaaa") + user_identity_id = UserPushIdentityCompat(user_id=1) + user_identity_uuid = UserPushIdentityCompat(user_uuid="aaaa") + user_identity_both = UserPushIdentityCompat(user_id=1, user_uuid="aaaa") self.assertEqual(user_identity_id.filter_q(), Q(user_id=1)) self.assertEqual(user_identity_uuid.filter_q(), Q(user_uuid="aaaa")) self.assertEqual(user_identity_both.filter_q(), Q(user_uuid="aaaa") | Q(user_id=1)) def test_eq(self) -> None: - user_identity_a = UserPushIndentityCompat(user_id=1) - user_identity_b = UserPushIndentityCompat(user_id=1) - user_identity_c = UserPushIndentityCompat(user_id=2) + user_identity_a = UserPushIdentityCompat(user_id=1) + user_identity_b = UserPushIdentityCompat(user_id=1) + user_identity_c = UserPushIdentityCompat(user_id=2) self.assertEqual(user_identity_a, user_identity_b) self.assertNotEqual(user_identity_a, user_identity_c) diff --git a/zerver/tests/test_retention.py b/zerver/tests/test_retention.py index 42629586d5..f1b7f61033 100644 --- a/zerver/tests/test_retention.py +++ b/zerver/tests/test_retention.py @@ -657,8 +657,8 @@ class MoveMessageToArchiveGeneral(MoveMessageToArchiveBase): king = self.lear_user("king") zulip_msg_ids = [self.send_personal_message(iago, othello) for i in range(0, 3)] - leary_msg_ids = [self.send_personal_message(cordelia, king) for i in range(0, 3)] - msg_ids = zulip_msg_ids + leary_msg_ids + lear_msg_ids = [self.send_personal_message(cordelia, king) for i in range(0, 3)] + msg_ids = zulip_msg_ids + lear_msg_ids usermsg_ids = self._get_usermessage_ids(msg_ids) self._assert_archive_empty() diff --git a/zerver/webhooks/clubhouse/view.py b/zerver/webhooks/clubhouse/view.py index f00c1da506..9a62342c22 100644 --- a/zerver/webhooks/clubhouse/view.py +++ b/zerver/webhooks/clubhouse/view.py @@ -546,7 +546,7 @@ def get_story_update_owner_body(payload: WildValue, action: WildValue) -> str: def get_story_update_batch_body(payload: WildValue, action: WildValue) -> Optional[str]: # When the user selects one or more stories with the checkbox, they can perform - # a batch update on multiple stories while changing multiple attribtues at the + # a batch update on multiple stories while changing multiple attributes at the # same time. changes = action["changes"] kwargs = { diff --git a/zerver/webhooks/github/tests.py b/zerver/webhooks/github/tests.py index 679bbe09ba..6247e7ed43 100644 --- a/zerver/webhooks/github/tests.py +++ b/zerver/webhooks/github/tests.py @@ -56,26 +56,26 @@ class GitHubWebhookTest(WebhookTestCase): expected_message = "baxterthehacker [pushed](https://github.com/baxterthehacker/public-repo/compare/9049f1265b7d...0d1a26e67d8f) 1 commit to branch changes.\n\n* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))" self.check_webhook("push__1_commit", TOPIC_BRANCH, expected_message) - def test_push_multiple_comitters(self) -> None: + def test_push_multiple_committers(self) -> None: commits_info = "* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))\n" expected_message = f"""baxterthehacker [pushed](https://github.com/baxterthehacker/public-repo/compare/9049f1265b7d...0d1a26e67d8f) 6 commits to branch changes. Commits by Tomasz (3), Ben (2) and baxterthehacker (1).\n\n{commits_info * 5}* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))""" self.check_webhook("push__multiple_committers", TOPIC_BRANCH, expected_message) - def test_push_multiple_comitters_with_others(self) -> None: + def test_push_multiple_committers_with_others(self) -> None: commits_info = "* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))\n" expected_message = f"""baxterthehacker [pushed](https://github.com/baxterthehacker/public-repo/compare/9049f1265b7d...0d1a26e67d8f) 10 commits to branch changes. Commits by Tomasz (4), Ben (3), James (2) and others (1).\n\n{commits_info * 9}* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))""" self.check_webhook("push__multiple_committers_with_others", TOPIC_BRANCH, expected_message) - def test_push_multiple_comitters_filtered_by_branches(self) -> None: + def test_push_multiple_committers_filtered_by_branches(self) -> None: self.url = self.build_webhook_url("master,changes") commits_info = "* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))\n" expected_message = f"""baxterthehacker [pushed](https://github.com/baxterthehacker/public-repo/compare/9049f1265b7d...0d1a26e67d8f) 6 commits to branch changes. Commits by Tomasz (3), Ben (2) and baxterthehacker (1).\n\n{commits_info * 5}* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))""" self.check_webhook("push__multiple_committers", TOPIC_BRANCH, expected_message) - def test_push_multiple_comitters_with_others_filtered_by_branches(self) -> None: + def test_push_multiple_committers_with_others_filtered_by_branches(self) -> None: self.url = self.build_webhook_url("master,changes") commits_info = "* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))\n" expected_message = f"""baxterthehacker [pushed](https://github.com/baxterthehacker/public-repo/compare/9049f1265b7d...0d1a26e67d8f) 10 commits to branch changes. Commits by Tomasz (4), Ben (3), James (2) and others (1).\n\n{commits_info * 9}* Update README.md ([0d1a26e67d8](https://github.com/baxterthehacker/public-repo/commit/0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c))""" @@ -419,12 +419,12 @@ A temporary team so that I can get some webhook fixtures! payload = self.get_body("push__50_commits") self.verify_post_is_ignored(payload, "push") - def test_push_multiple_comitters_filtered_by_branches_ignore(self) -> None: + def test_push_multiple_committers_filtered_by_branches_ignore(self) -> None: self.url = self.build_webhook_url(branches="master,development") payload = self.get_body("push__multiple_committers") self.verify_post_is_ignored(payload, "push") - def test_push_multiple_comitters_with_others_filtered_by_branches_ignore(self) -> None: + def test_push_multiple_committers_with_others_filtered_by_branches_ignore(self) -> None: self.url = self.build_webhook_url(branches="master,development") payload = self.get_body("push__multiple_committers_with_others") self.verify_post_is_ignored(payload, "push") diff --git a/zerver/webhooks/gitlab/fixtures/pipeline_hook__pipline_succeeded_with_artifacts.json b/zerver/webhooks/gitlab/fixtures/pipeline_hook__pipeline_succeeded_with_artifacts.json similarity index 100% rename from zerver/webhooks/gitlab/fixtures/pipeline_hook__pipline_succeeded_with_artifacts.json rename to zerver/webhooks/gitlab/fixtures/pipeline_hook__pipeline_succeeded_with_artifacts.json diff --git a/zerver/webhooks/gitlab/tests.py b/zerver/webhooks/gitlab/tests.py index a132471761..ebd246ca2c 100644 --- a/zerver/webhooks/gitlab/tests.py +++ b/zerver/webhooks/gitlab/tests.py @@ -472,7 +472,7 @@ A trivial change that should probably be ignored. expected_message = "[Pipeline (22668)](https://gitlab.example.com/group1/onlysomeproject/pipelines/22668) changed status to success with build(s):\n* [cleanup:cleanup docker image](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58592) - success\n* [pages](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58591) - success\n * built artifact: *artifacts.zip* [[Browse](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58591/artifacts/browse)|[Download](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58591/artifacts/download)]\n* [black+pytest:future environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58590) - success\n* [docs:anaconda environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58589) - success\n * built artifact: *sphinx-docs.zip* [[Browse](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58589/artifacts/browse)|[Download](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58589/artifacts/download)]\n* [pytest:current environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58588) - success\n* [black:current environment](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58587) - success\n* [setup:docker image](https://gitlab.example.com/group1/onlysomeproject/-/jobs/58586) - success." self.check_webhook( - "pipeline_hook__pipline_succeeded_with_artifacts", + "pipeline_hook__pipeline_succeeded_with_artifacts", expected_topic, expected_message, ) diff --git a/zerver/webhooks/librato/fixtures/three_conditions_alert.json b/zerver/webhooks/librato/fixtures/three_conditions_alert.json index e9741b84bf..9be772cd9f 100644 --- a/zerver/webhooks/librato/fixtures/three_conditions_alert.json +++ b/zerver/webhooks/librato/fixtures/three_conditions_alert.json @@ -1,7 +1,7 @@ { "alert": { "id": 6294535, - "name": "ToHighTemeprature", + "name": "TooHighTemperature", "runbook_url": "http://www.use.water.pl", "version": 2, "description": "Measurement of temperature in your computer" diff --git a/zerver/webhooks/librato/tests.py b/zerver/webhooks/librato/tests.py index 077eae67e0..a3782dd0e9 100644 --- a/zerver/webhooks/librato/tests.py +++ b/zerver/webhooks/librato/tests.py @@ -39,7 +39,7 @@ class LibratoHookTests(WebhookTestCase): def test_three_conditions_alert_message(self) -> None: expected_message = "Alert [alert_name](https://metrics.librato.com/alerts#/6294535) has triggered! [Reaction steps](http://www.use.water.pl):\n * Metric `collectd.interface.eth0.if_octets.tx`, absolute_value was above 4 by 300s, recorded at 2016-04-11 20:40:14 UTC.\n * Metric `collectd.load.load.longterm`, max was above 99, recorded at 2016-04-11 20:40:14 UTC.\n * Metric `librato.swap.swap.cached`, average was absent by 60s, recorded at 2016-04-11 20:40:14 UTC." - expected_topic = "Alert ToHighTemeprature" + expected_topic = "Alert TooHighTemperature" self.check_webhook( "three_conditions_alert", expected_topic, diff --git a/zerver/webhooks/pagerduty/view.py b/zerver/webhooks/pagerduty/view.py index 505afa453a..913baa2c53 100644 --- a/zerver/webhooks/pagerduty/view.py +++ b/zerver/webhooks/pagerduty/view.py @@ -200,7 +200,7 @@ def build_pagerduty_formatdict_v3(event: WildValue) -> FormatDictType: return format_dict -def send_formated_pagerduty( +def send_formatted_pagerduty( request: HttpRequest, user_profile: UserProfile, message_type: str, @@ -253,7 +253,7 @@ def api_pagerduty_webhook( raise UnsupportedWebhookEventTypeError(message_type) format_dict = build_pagerduty_formatdict(message) - send_formated_pagerduty(request, user_profile, message_type, format_dict) + send_formatted_pagerduty(request, user_profile, message_type, format_dict) for message in messages: message_event = message.get("event").tame(check_none_or(check_string)) @@ -267,7 +267,7 @@ def api_pagerduty_webhook( raise UnsupportedWebhookEventTypeError(message_event) format_dict = build_pagerduty_formatdict_v2(message) - send_formated_pagerduty(request, user_profile, message_event, format_dict) + send_formatted_pagerduty(request, user_profile, message_event, format_dict) else: if "event" in payload: # V3 has no "messages" field, and it has key "event" instead @@ -278,6 +278,6 @@ def api_pagerduty_webhook( raise UnsupportedWebhookEventTypeError(event_type) format_dict = build_pagerduty_formatdict_v3(event) - send_formated_pagerduty(request, user_profile, event_type, format_dict) + send_formatted_pagerduty(request, user_profile, event_type, format_dict) return json_success(request) diff --git a/zilencer/management/commands/populate_db.py b/zilencer/management/commands/populate_db.py index 90633e1b55..b31773716d 100644 --- a/zilencer/management/commands/populate_db.py +++ b/zilencer/management/commands/populate_db.py @@ -1002,7 +1002,7 @@ def get_recipient_by_id(rid: int) -> Recipient: # - multiple streams # - multiple subjects per stream # - multiple huddles -# - multiple personals converastions +# - multiple personal conversations # - multiple messages per subject # - both single and multi-line content def generate_and_send_messages( diff --git a/zilencer/views.py b/zilencer/views.py index 07c4479274..0951dca3ac 100644 --- a/zilencer/views.py +++ b/zilencer/views.py @@ -19,7 +19,7 @@ from corporate.lib.stripe import do_deactivate_remote_server from zerver.decorator import require_post from zerver.lib.exceptions import JsonableError from zerver.lib.push_notifications import ( - UserPushIndentityCompat, + UserPushIdentityCompat, send_android_push_notification, send_apple_push_notification, ) @@ -192,7 +192,7 @@ def unregister_remote_push_device( ios_app_id: Optional[str] = None, ) -> HttpResponse: validate_bouncer_token_request(token, token_kind) - user_identity = UserPushIndentityCompat(user_id=user_id, user_uuid=user_uuid) + user_identity = UserPushIdentityCompat(user_id=user_id, user_uuid=user_uuid) deleted = RemotePushDeviceToken.objects.filter( user_identity.filter_q(), token=token, kind=token_kind, server=server @@ -210,7 +210,7 @@ def unregister_all_remote_push_devices( user_id: Optional[int] = REQ(json_validator=check_int, default=None), user_uuid: Optional[str] = REQ(default=None), ) -> HttpResponse: - user_identity = UserPushIndentityCompat(user_id=user_id, user_uuid=user_uuid) + user_identity = UserPushIdentityCompat(user_id=user_id, user_uuid=user_uuid) RemotePushDeviceToken.objects.filter(user_identity.filter_q(), server=server).delete() return json_success(request) @@ -222,7 +222,7 @@ def remote_server_notify_push( server: RemoteZulipServer, payload: Dict[str, Any] = REQ(argument_type="body"), ) -> HttpResponse: - user_identity = UserPushIndentityCompat(payload.get("user_id"), payload.get("user_uuid")) + user_identity = UserPushIdentityCompat(payload.get("user_id"), payload.get("user_uuid")) gcm_payload = payload["gcm_payload"] apns_payload = payload["apns_payload"]