@@ -100,10 +100,10 @@ def test_update_category_adds_subcategories(self, create_authenticated_headers,
100100 assert self ._category_subcategory_ids (category ["id" ]) == sorted ([subcategory1 ["id" ], subcategory2 ["id" ]])
101101
102102 def test_update_category_adds_linked_subcategories (self , create_authenticated_headers , create_category , create_subcategory ):
103- headers = create_authenticated_headers ()
104- subcategory = create_subcategory ("U_SC1" , headers = headers ).get_json ()
105- category = create_category ("U_Cat" , subcategories = [subcategory ["id" ]], headers = headers ).get_json ()
103+ subcategory = create_subcategory ("U_SC1" ).get_json ()
104+ category = create_category ("U_Cat" , subcategories = [subcategory ["id" ]]).get_json ()
106105
106+ headers = create_authenticated_headers ()
107107 with pytest .raises (IntegrityError ) as ie :
108108 self .client .put (f"/categories/{ category ['id' ]} " , json = {"subcategories" : [subcategory ["id" ]]}, headers = headers )
109109
@@ -112,13 +112,13 @@ def test_update_category_adds_linked_subcategories(self, create_authenticated_he
112112 assert self ._category_subcategory_ids (category ["id" ]) == [subcategory ["id" ]]
113113
114114 def test_update_subcategory_adds_categories_and_products (self , create_authenticated_headers , create_category , create_product , create_subcategory ):
115- headers = create_authenticated_headers ()
116- category1 = create_category ("UC1" , headers = headers ).get_json ()
117- category2 = create_category ("UC2" , headers = headers ).get_json ()
118- product1 = create_product ("UP1" , headers = headers ).get_json ()
119- product2 = create_product ("UP2" , headers = headers ).get_json ()
120- subcategory = create_subcategory ("U_SC" , headers = headers ).get_json ()
115+ category1 = create_category ("UC1" ).get_json ()
116+ category2 = create_category ("UC2" ).get_json ()
117+ product1 = create_product ("UP1" ).get_json ()
118+ product2 = create_product ("UP2" ).get_json ()
119+ subcategory = create_subcategory ("U_SC" ).get_json ()
121120
121+ headers = create_authenticated_headers ()
122122 update_response = self .client .put (
123123 f"/subcategories/{ subcategory ['id' ]} " ,
124124 json = {"categories" : [category1 ["id" ], category2 ["id" ]], "products" : [product1 ["id" ], product2 ["id" ]]},
@@ -130,11 +130,11 @@ def test_update_subcategory_adds_categories_and_products(self, create_authentica
130130 assert self ._subcategory_product_ids (subcategory ["id" ]) == sorted ([product1 ["id" ], product2 ["id" ]])
131131
132132 def test_update_subcategory_adds_linked_categories_and_products (self , create_authenticated_headers , create_category , create_product , create_subcategory ):
133- headers = create_authenticated_headers ()
134- category = create_category ("UC1" , headers = headers ).get_json ()
135- product = create_product ("UP1" , headers = headers ).get_json ()
136- subcategory = create_subcategory ("U_SC" , categories = [category ["id" ]], products = [product ["id" ]], headers = headers ).get_json ()
133+ category = create_category ("UC1" ).get_json ()
134+ product = create_product ("UP1" ).get_json ()
135+ subcategory = create_subcategory ("U_SC" , categories = [category ["id" ]], products = [product ["id" ]]).get_json ()
137136
137+ headers = create_authenticated_headers ()
138138 with pytest .raises (IntegrityError ) as ie_c :
139139 self .client .put (
140140 f"/subcategories/{ subcategory ['id' ]} " ,
@@ -215,11 +215,10 @@ def test_get_subcategory_categories_empty(self, create_subcategory):
215215 resp = self .client .get (f"/subcategories/{ subcategory ['id' ]} /categories" )
216216 self ._assert_related_collection (resp , "categories" )
217217
218- def test_get_subcategory_categories_populated (self , create_category , create_subcategory , create_authenticated_headers ):
219- headers = create_authenticated_headers ()
220- category1 = create_category ("C1" , headers = headers ).get_json ()
221- category2 = create_category ("C2" , headers = headers ).get_json ()
222- subcategory = create_subcategory ("SC_Cats" , categories = [category1 ["id" ], category2 ["id" ]], headers = headers ).get_json ()
218+ def test_get_subcategory_categories_populated (self , create_category , create_subcategory ):
219+ category1 = create_category ("C1" ).get_json ()
220+ category2 = create_category ("C2" ).get_json ()
221+ subcategory = create_subcategory ("SC_Cats" , categories = [category1 ["id" ], category2 ["id" ]]).get_json ()
223222
224223 resp = self .client .get (f"/subcategories/{ subcategory ['id' ]} /categories" )
225224 self ._assert_related_collection (resp , "categories" , expected_ids = [category1 ["id" ], category2 ["id" ]])
@@ -229,13 +228,12 @@ def test_get_subcategory_products_empty(self, create_subcategory):
229228 resp = self .client .get (f"/subcategories/{ subcategory ['id' ]} /products" )
230229 self ._assert_related_collection (resp , "products" )
231230
232- def test_get_subcategory_products_populated_with_pagination (self , create_subcategory , create_product , create_authenticated_headers ):
233- headers = create_authenticated_headers ()
234- subcategory = create_subcategory ("SC_Pag" , headers = headers ).get_json ()
231+ def test_get_subcategory_products_populated_with_pagination (self , create_subcategory , create_product ):
232+ subcategory = create_subcategory ("SC_Pag" ).get_json ()
235233
236234 product_ids = set ()
237235 for index in range (11 ):
238- product_resp = create_product (f"SP{ index } " , "desc" , subcategories = [subcategory ["id" ]], headers = headers )
236+ product_resp = create_product (f"SP{ index } " , "desc" , subcategories = [subcategory ["id" ]])
239237 product_ids .add (product_resp .get_json ().get ("id" ))
240238
241239 page1 = self .client .get (f"/subcategories/{ subcategory ['id' ]} /products?page=1" ).get_json ()
0 commit comments