diff --git a/api/tests/core/offers/test_repository.py b/api/tests/core/offers/test_repository.py index 3782af9d990..f700014cb67 100644 --- a/api/tests/core/offers/test_repository.py +++ b/api/tests/core/offers/test_repository.py @@ -2641,22 +2641,23 @@ def test_get_inactive_headline_offers_basic(self): active_offer = factories.OfferFactory(isActive=True) factories.StockFactory(offer=active_offer) - active_offer_headline_offer = factories.HeadlineOfferFactory(offer=active_offer, create_mediation=True) + # active offer headline offer: + factories.HeadlineOfferFactory(offer=active_offer, create_mediation=True) finished_timespan = ( datetime.datetime.utcnow() - datetime.timedelta(days=20), datetime.datetime.utcnow() - datetime.timedelta(days=10), ) - already_inactive_offer_headline_offer = factories.HeadlineOfferFactory( - offer=active_offer, timespan=finished_timespan, create_mediation=True - ) + # alreeady inactive offer headline offer: + factories.HeadlineOfferFactory(offer=active_offer, timespan=finished_timespan, create_mediation=True) another_active_offer = factories.OfferFactory(isActive=True) timespan_finishing_in_the_future = ( datetime.datetime.utcnow() - datetime.timedelta(days=3), datetime.datetime.utcnow() + datetime.timedelta(days=3), ) - soon_to_be_inactive_timespan = factories.HeadlineOfferFactory( + # soon to be inactive offer headline offer: + factories.HeadlineOfferFactory( offer=another_active_offer, timespan=timespan_finishing_in_the_future, create_mediation=True ) @@ -2679,9 +2680,8 @@ def test_get_inactive_headline_offers_should_not_return_already_deactivated_head datetime.datetime.utcnow() - datetime.timedelta(days=20), datetime.datetime.utcnow() - datetime.timedelta(days=10), ) - already_inactive_offer_headline_offer = factories.HeadlineOfferFactory( - offer=inactive_offer, timespan=finished_timespan, create_mediation=True - ) + # already inactive headline offer + factories.HeadlineOfferFactory(offer=inactive_offer, timespan=finished_timespan, create_mediation=True) another_inactive_offer = factories.OfferFactory(isActive=False) timespan_finishing_in_the_future = ( @@ -2712,9 +2712,8 @@ def test_get_inactive_headline_offers_without_images(self): datetime.datetime.utcnow() - datetime.timedelta(days=20), datetime.datetime.utcnow() - datetime.timedelta(days=10), ) - already_inactive_headline_offer_without_mediation = factories.HeadlineOfferFactory( - offer=offer, timespan=finished_timespan, create_mediation=False - ) + # already inactive headline offer without mediation + factories.HeadlineOfferFactory(offer=offer, timespan=finished_timespan, create_mediation=False) headline_offer_query_result = repository.get_inactive_headline_offers() assert headline_offer_query_result == [headline_offer_without_mediation] diff --git a/api/tests/core/subscription/ubble/test_api.py b/api/tests/core/subscription/ubble/test_api.py index ed389d93154..524e2071394 100644 --- a/api/tests/core/subscription/ubble/test_api.py +++ b/api/tests/core/subscription/ubble/test_api.py @@ -136,7 +136,7 @@ def test_applicant_creation_flow(self, requests_mock): @pytest.mark.features(WIP_UBBLE_V2=True) def test_applicant_creation_flow_updates_fraud_check(self, requests_mock): user = users_factories.UserFactory() - fraud_check = fraud_factories.BeneficiaryFraudCheckFactory( + fraud_factories.BeneficiaryFraudCheckFactory( type=fraud_models.FraudCheckType.UBBLE, user=user, thirdPartyId="", diff --git a/api/tests/local_providers/allocine_stocks_test.py b/api/tests/local_providers/allocine_stocks_test.py index b12d7ece9c9..8f1fa8ff871 100644 --- a/api/tests/local_providers/allocine_stocks_test.py +++ b/api/tests/local_providers/allocine_stocks_test.py @@ -186,9 +186,11 @@ def test_should_create_one_offer_with_movie_info( allocine_stocks_provider.updateObjects() # Then - created_offer = offers_models.Offer.query.one() + created_offer = offers_models.Offer.query.first() created_stocks = offers_models.Stock.query.all() + assert created_offer, "No offer created" + for created_stock in created_stocks: assert created_stock.price == decimal.Decimal("4.0") assert created_stock.priceCategory.price == decimal.Decimal("4.0") diff --git a/api/tests/routes/backoffice/individual_bookings_test.py b/api/tests/routes/backoffice/individual_bookings_test.py index a0dddf0bbb7..d7abf6c6387 100644 --- a/api/tests/routes/backoffice/individual_bookings_test.py +++ b/api/tests/routes/backoffice/individual_bookings_test.py @@ -810,7 +810,7 @@ def test_uncancel_booking_no_stock(self, authenticated_client, bookings): def test_uncancel_and_mark_as_used_unlocks_achievement(self, authenticated_client, bookings): festival_booking = bookings[1] - response = self.post_to_endpoint(authenticated_client, booking_id=festival_booking.id) + self.post_to_endpoint(authenticated_client, booking_id=festival_booking.id) assert festival_booking.user.achievements @@ -1216,7 +1216,7 @@ def test_batch_mark_as_used_bookings_with_multiple_errors(self, legit_user, auth def test_batch_mark_as_used_unlocks_achievement(self, authenticated_client, bookings): festival_booking = bookings[1] - response = self.post_to_endpoint(authenticated_client, form={"object_ids": str(festival_booking.id)}) + self.post_to_endpoint(authenticated_client, form={"object_ids": str(festival_booking.id)}) assert festival_booking.user.achievements diff --git a/api/tests/routes/backoffice/offerers_test.py b/api/tests/routes/backoffice/offerers_test.py index 8c1b6f1d210..fbe0d9d1a2c 100644 --- a/api/tests/routes/backoffice/offerers_test.py +++ b/api/tests/routes/backoffice/offerers_test.py @@ -856,7 +856,7 @@ def test_get_stats(self, authenticated_client, venue_factory, expected_revenue_t venue=venue, validation=offers_models.OfferValidationStatus.APPROVED.value, ) - booking = bookings_factories.BookingFactory( + bookings_factories.BookingFactory( status=bookings_models.BookingStatus.USED, quantity=1, amount=10, @@ -1239,7 +1239,7 @@ def test_action_name_depends_on_type(self, authenticated_client, offerer): def test_get_full_sorted_history(self, authenticated_client, legit_user): admin = users_factories.UserFactory() user_offerer = offerers_factories.UserOffererFactory() - new_offerer_action = history_factories.ActionHistoryFactory( + history_factories.ActionHistoryFactory( actionDate=datetime.datetime(2022, 10, 3, 13, 1), actionType=history_models.ActionType.OFFERER_NEW, authorUser=user_offerer.user, @@ -1247,7 +1247,7 @@ def test_get_full_sorted_history(self, authenticated_client, legit_user): offerer=user_offerer.offerer, comment=None, ) - pending_offerer_action = history_factories.ActionHistoryFactory( + history_factories.ActionHistoryFactory( actionDate=datetime.datetime(2022, 10, 4, 14, 2), actionType=history_models.ActionType.OFFERER_PENDING, authorUser=admin, @@ -1255,7 +1255,7 @@ def test_get_full_sorted_history(self, authenticated_client, legit_user): offerer=user_offerer.offerer, comment="Documents complémentaires demandés", ) - comment_action = history_factories.ActionHistoryFactory( + history_factories.ActionHistoryFactory( actionDate=datetime.datetime(2022, 10, 5, 15, 3), actionType=history_models.ActionType.COMMENT, authorUser=legit_user, @@ -1263,7 +1263,7 @@ def test_get_full_sorted_history(self, authenticated_client, legit_user): offerer=user_offerer.offerer, comment="Documents reçus", ) - validated_offerer_action = history_factories.ActionHistoryFactory( + history_factories.ActionHistoryFactory( actionDate=datetime.datetime(2022, 10, 6, 16, 4), actionType=history_models.ActionType.OFFERER_VALIDATED, authorUser=admin, @@ -1271,7 +1271,7 @@ def test_get_full_sorted_history(self, authenticated_client, legit_user): offerer=user_offerer.offerer, comment=None, ) - other_comment_action = history_factories.ActionHistoryFactory( + history_factories.ActionHistoryFactory( actionDate=datetime.datetime(2022, 10, 6, 17, 5), actionType=history_models.ActionType.COMMENT, authorUser=admin, diff --git a/api/tests/routes/backoffice/venues_test.py b/api/tests/routes/backoffice/venues_test.py index f7ab0356b01..0b7658fe19e 100644 --- a/api/tests/routes/backoffice/venues_test.py +++ b/api/tests/routes/backoffice/venues_test.py @@ -1193,7 +1193,6 @@ def test_update_venue_with_address_manual_edition_clear_field_ban_id( self, mock_get_municipality_centroid, authenticated_client ): venue = offerers_factories.VenueFactory() - offerer_address_id = venue.offererAddressId other_venue = offerers_factories.VenueFactory( street="1 Rue Poivre", postalCode="97400", diff --git a/api/tests/routes/external/user_subscription_test.py b/api/tests/routes/external/user_subscription_test.py index 6ce3cb8baba..9babea25175 100644 --- a/api/tests/routes/external/user_subscription_test.py +++ b/api/tests/routes/external/user_subscription_test.py @@ -971,7 +971,7 @@ class UbbleWebhookV2Test: ], ) def test_ignore_events_before_identification_conclusion(self, ubble_client, status): - fraud_check = fraud_factories.BeneficiaryFraudCheckFactory( + fraud_factories.BeneficiaryFraudCheckFactory( type=fraud_models.FraudCheckType.UBBLE, thirdPartyId="idv_qwerty123", status=fraud_models.FraudCheckStatus.STARTED, diff --git a/api/tests/routes/pro/delete_stock_test.py b/api/tests/routes/pro/delete_stock_test.py index 2b588f82fb7..8256a4665ca 100644 --- a/api/tests/routes/pro/delete_stock_test.py +++ b/api/tests/routes/pro/delete_stock_test.py @@ -52,7 +52,7 @@ def when_current_user_has_rights_on_offer_with_FF(self, client, db_session): offerer=offer.venue.managingOfferer, ) stock = offers_factories.StockFactory(offer=offer) - booking = BookingFactory(stock=stock) + BookingFactory(stock=stock) # when response = client.with_session_auth("pro@example.com").delete(f"/stocks/{stock.id}") diff --git a/api/tests/routes/pro/get_offerer_addresses_test.py b/api/tests/routes/pro/get_offerer_addresses_test.py index 61a8bcf81dc..820db8c3176 100644 --- a/api/tests/routes/pro/get_offerer_addresses_test.py +++ b/api/tests/routes/pro/get_offerer_addresses_test.py @@ -104,7 +104,7 @@ def test_get_offerer_addresses_with_offers(self, client): address__city="Paris", address__banId="75107_7560_00001", ) - offer = offers_factories.OfferFactory( + offers_factories.OfferFactory( venue__managingOfferer=offerer, offererAddress=offerer_address_1, venue__offererAddress=offerer_address_1, diff --git a/api/tests/routes/pro/get_product_by_ean_test.py b/api/tests/routes/pro/get_product_by_ean_test.py index b2ee678d094..6bc85377135 100644 --- a/api/tests/routes/pro/get_product_by_ean_test.py +++ b/api/tests/routes/pro/get_product_by_ean_test.py @@ -57,7 +57,7 @@ def test_get_product_by_ean_empty_product_description(self, client): offerer_id = offerer.id offerers_factories.UserOffererFactory(user=user, offerer=offerer) offerers_factories.VenueFactory(managingOfferer=offerer) - product = offers_factories.ProductFactory( + offers_factories.ProductFactory( description=None, name="Product name", subcategoryId=subcategories_v2.LIVRE_PAPIER.id, diff --git a/api/tests/routes/pro/patch_offer_test.py b/api/tests/routes/pro/patch_offer_test.py index 37e573ebebf..9f3c55a0e88 100644 --- a/api/tests/routes/pro/patch_offer_test.py +++ b/api/tests/routes/pro/patch_offer_test.py @@ -511,7 +511,6 @@ def test_user_can_link_offer_to_the_offerer_address_of_venue(self, get_address_m assert response.status_code == 200 assert response.json["id"] == offer.id - updated_offer = Offer.query.get(offer.id) assert offer.offererAddressId == venue.offererAddressId @patch("pcapi.connectors.api_adresse.get_municipality_centroid") diff --git a/api/tests/routes/pro/patch_venue_test.py b/api/tests/routes/pro/patch_venue_test.py index 593076d0baa..4b49f695b13 100644 --- a/api/tests/routes/pro/patch_venue_test.py +++ b/api/tests/routes/pro/patch_venue_test.py @@ -360,8 +360,6 @@ def test_update_venue_location_with_manual_edition_and_oa(self, client) -> None: ) auth_request = client.with_session_auth(email=user_offerer.user.email) - venue_id = venue.id - venue_data = populate_missing_data_from_venue( { # Default data from api adresse TestingBackend @@ -518,8 +516,6 @@ def test_update_should_be_able_to_update_venue_even_if_only_centroid_found( street=None, ) auth_request = client.with_session_auth(email=user_offerer.user.email) - venue_id = venue.id - venue_data = populate_missing_data_from_venue( { # Data sent by the frontend, originated from BAN autocomplete field @@ -595,10 +591,9 @@ def test_should_not_create_oa_when_not_updating_location(self, client): city="Lens", managingOfferer=user_offerer.offerer, ) - offerer_address = venue.offererAddress update_data = {"bookingEmail": "fakeemail@fake.com"} auth_request = client.with_session_auth(email=user_offerer.user.email) - response = auth_request.patch("/venues/%s" % venue.id, json=update_data) + auth_request.patch("/venues/%s" % venue.id, json=update_data) venue = offerers_models.Venue.query.one() offerer_addresses = offerers_models.OffererAddress.query.order_by(offerers_models.OffererAddress.id).all() diff --git a/api/tests/routes/pro/post_stocks_test.py b/api/tests/routes/pro/post_stocks_test.py index 1020748cc56..34c506a704f 100644 --- a/api/tests/routes/pro/post_stocks_test.py +++ b/api/tests/routes/pro/post_stocks_test.py @@ -374,7 +374,7 @@ def test_edit_one_event_stock_created_with_price_category(self, mocked_async_ind ], } with caplog.at_level(logging.INFO): - response = client.with_session_auth(user.email).post("/stocks/bulk/", json=stock_data) + client.with_session_auth(user.email).post("/stocks/bulk/", json=stock_data) created_stock = Stock.query.first() assert offer.id == created_stock.offerId