photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformat code with black

Browse Source
This commit is contained in:
Martin
2019-10-30 13:44:04 +01:00
parent 354e959cc5
commit 0dd8d619b4
28 changed files with 1236 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/resources/test_designers.py
+27 -21
View File
@@ -6,9 +6,8 @@ from unittest.mock import patch
class TestEndpoints(flask_testing.TestCase):
def create_app(self):
return create_app('tests.config')
return create_app("tests.config")
def setUp(self):
db.create_all()
@@ -17,7 +16,7 @@ class TestEndpoints(flask_testing.TestCase):
db.session.remove()
db.drop_all()
def _add_designer(self, name, username=None, territory='SE', currency='SEK'):
def _add_designer(self, name, username=None, territory="SE", currency="SEK"):
if not username:
username = name.lower()
designer = Designer(name, username, territory, currency)
@@ -26,38 +25,45 @@ class TestEndpoints(flask_testing.TestCase):
return designer
def test_list_designers(self):
self._add_designer('designer1')
self._add_designer('designer2')
self._add_designer("designer1")
self._add_designer("designer2")
response = self.client.get("/designers/")
self.assertEqual(2, len(response.json.get('data')))
self.assertEqual(2, len(response.json.get("data")))
def test_get_designer(self):
designer = self._add_designer('designer1')
response = self.client.get('/designers/1')
designer = self._add_designer("designer1")
response = self.client.get("/designers/1")
self.assert200(response)
def test_create_designer(self):
data = {'name': 'Spider-Man', 'username': 'spiderman',
'territory': 'US', 'currency': 'USD'}
data = {
"name": "Spider-Man",
"username": "spiderman",
"territory": "US",
"currency": "USD",
}
response = self.client.post(
'/designers/', data=json.dumps(data), content_type='application/json')
"/designers/", data=json.dumps(data), content_type="application/json"
)
self.assertEqual(201, response.status_code)
designer = response.json
self.assertEqual('Spider-Man', designer['name'])
self.assertEqual('spider_man', designer['path'])
self.assertEqual("Spider-Man", designer["name"])
self.assertEqual("spider_man", designer["path"])
def test_create_designer_missing_data(self):
data = {'name': 'Only name'}
data = {"name": "Only name"}
response = self.client.post(
'/designers/', data=json.dumps(data), content_type='application/json')
"/designers/", data=json.dumps(data), content_type="application/json"
)
self.assert400(response)
@patch('api.tasks.esales.update_designer')
@patch("api.tasks.esales.update_designer")
def test_update_designer(self, esales_update_designer):
designer = self._add_designer('designer1')
data = {'name': 'test'}
designer = self._add_designer("designer1")
data = {"name": "test"}
response = self.client.put(
'/designers/1', data=json.dumps(data), content_type='application/json')
"/designers/1", data=json.dumps(data), content_type="application/json"
)
self.assertTrue(esales_update_designer.called)
self.assertEqual('test', response.json['name'])
self.assertEqual('test', Designer.query.get(1).name)
self.assertEqual("test", response.json["name"])
self.assertEqual("test", Designer.query.get(1).name)
tests/resources/test_prices.py
+87 -87
View File
@@ -7,9 +7,8 @@ from api.models.designer import Designer
class TestEndpoints(flask_testing.TestCase):
def create_app(self):
return create_app('tests.config')
return create_app("tests.config")
def setUp(self):
db.create_all()
@@ -26,14 +25,16 @@ class TestEndpoints(flask_testing.TestCase):
def _add_inquiry(self, territory, product_group, price_retouch=100):
inquiry = Inquiry(
territory=territory, product_group=product_group, price_retouch=price_retouch)
territory=territory,
product_group=product_group,
price_retouch=price_retouch,
)
db.session.add(inquiry)
db.session.commit()
return inquiry
def _add_designer(self, pricepremium):
designer = Designer('Disney', 'disney', 'US',
'USD', pricepremium=pricepremium)
designer = Designer("Disney", "disney", "US", "USD", pricepremium=pricepremium)
db.session.add(designer)
db.session.commit()
return designer
@@ -45,61 +46,60 @@ class TestEndpoints(flask_testing.TestCase):
return product
def test_wallpaper(self):
self._add_material('standard-wallpaper', 1, 23600)
self._add_material('premium-wallpaper', 1, 26000)
response = self.client.get(
'/prices/wallpaper?width=200&height=10&territory=SE')
self._add_material("standard-wallpaper", 1, 23600)
self._add_material("premium-wallpaper", 1, 26000)
response = self.client.get("/prices/wallpaper?width=200&height=10&territory=SE")
self.assert200(response)
expected = [
{
'm2_price': 295.0,
'm2_price_excl_vat': 236.0,
'price_excl_vat': 236.0,
'price': 295.0,
'material': 'standard-wallpaper',
'material_id': 1
"m2_price": 295.0,
"m2_price_excl_vat": 236.0,
"price_excl_vat": 236.0,
"price": 295.0,
"material": "standard-wallpaper",
"material_id": 1,
},
{
'm2_price': 325.0,
'm2_price_excl_vat': 260.0,
'price_excl_vat': 260.0,
'price': 325.0,
'material': 'premium-wallpaper',
'material_id': 2
}
"m2_price": 325.0,
"m2_price_excl_vat": 260.0,
"price_excl_vat": 260.0,
"price": 325.0,
"material": "premium-wallpaper",
"material_id": 2,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_wallpaper_with_product(self):
self._add_material('standard-wallpaper', 1, 23600)
self._add_material('premium-wallpaper', 1, 26000)
self._add_material("standard-wallpaper", 1, 23600)
self._add_material("premium-wallpaper", 1, 26000)
designer = self._add_designer(4)
product = self._add_product(designer)
response = self.client.get(
'/prices/wallpaper?width=200&height=200&territory=SE&product=1')
"/prices/wallpaper?width=200&height=200&territory=SE&product=1"
)
expected = [
{
'price': 1227.2,
'price_excl_vat': 981.76,
'material_id': 1,
'm2_price': 306.8,
'm2_price_excl_vat': 245.44,
'material': 'standard-wallpaper'
"price": 1227.2,
"price_excl_vat": 981.76,
"material_id": 1,
"m2_price": 306.8,
"m2_price_excl_vat": 245.44,
"material": "standard-wallpaper",
},
{
'price': 1352.0000000000002,
'price_excl_vat': 1081.6000000000001,
'material_id': 2,
'm2_price': 338.00000000000006,
'm2_price_excl_vat': 270.40000000000003,
'material': 'premium-wallpaper'
}
"price": 1352.0000000000002,
"price_excl_vat": 1081.6000000000001,
"material_id": 2,
"m2_price": 338.00000000000006,
"m2_price_excl_vat": 270.40000000000003,
"material": "premium-wallpaper",
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_canvas(self):
response = self.client.get(
'/prices/canvas?width=200&height=10&territory=SE')
response = self.client.get("/prices/canvas?width=200&height=10&territory=SE")
self.assert200(response)
expected = [
{
@@ -107,23 +107,24 @@ class TestEndpoints(flask_testing.TestCase):
"height": 40,
"price": 1008.0,
"price_excl_vat": 806.4,
"width": 150
"width": 150,
},
{
"framed": False,
"height": 20,
"price": 575.47,
"price_excl_vat": 460.37600000000003,
"width": 200
}
"width": 200,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_canvas_with_product(self):
designer = self._add_designer(4)
product = self._add_product(designer)
response = self.client.get(
'/prices/canvas?width=200&height=10&territory=SE&product=1')
"/prices/canvas?width=200&height=10&territory=SE&product=1"
)
self.assert200(response)
expected = [
{
@@ -131,73 +132,72 @@ class TestEndpoints(flask_testing.TestCase):
"height": 40,
"price": 1048.32,
"price_excl_vat": 838.656,
"width": 150
"width": 150,
},
{
"framed": False,
"height": 20,
"price": 598.4888000000001,
"price_excl_vat": 478.79104000000007,
"width": 200
}
"width": 200,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_diy_frame(self):
response = self.client.get(
'/prices/diy-frame?width=200&height=50&territory=SE')
response = self.client.get("/prices/diy-frame?width=200&height=50&territory=SE")
self.assert200(response)
product = response.json['data'][0]
self.assertEqual(150, product['width'], "it adjusts measurements")
self.assertEqual(50, product['height'])
self.assertAlmostEqual(731.25, product['price'], places=2)
product = response.json["data"][0]
self.assertEqual(150, product["width"], "it adjusts measurements")
self.assertEqual(50, product["height"])
self.assertAlmostEqual(731.25, product["price"], places=2)
def test_poster(self):
response = self.client.get('/prices/poster?width=50&height=30&territory=SE')
response = self.client.get("/prices/poster?width=50&height=30&territory=SE")
self.assert200(response)
expected = [
{
'hanger': True,
'height': 30,
'price': 397.5,
'price_excl_vat': 318,
'width': 50
"hanger": True,
"height": 30,
"price": 397.5,
"price_excl_vat": 318,
"width": 50,
},
{
'hanger': False,
'height': 30,
'price': 250.0,
'price_excl_vat': 200,
'width': 50
}
"hanger": False,
"height": 30,
"price": 250.0,
"price_excl_vat": 200,
"width": 50,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_poster_hanger(self):
response = self.client.get('/prices/poster-hanger?width=50&territory=SE')
response = self.client.get("/prices/poster-hanger?width=50&territory=SE")
self.assert200(response)
product = response.json['data'][0]
self.assertEqual(210.0, product['price'])
self.assertEqual(168, product['price_excl_vat'])
self.assertEqual(50, product['width'])
product = response.json["data"][0]
self.assertEqual(210.0, product["price"])
self.assertEqual(168, product["price_excl_vat"])
self.assertEqual(50, product["width"])
def test_inquiry_wallpaper(self):
self._add_material('standard-wallpaper', 1, 236)
self._add_material('premium-wallpaper', 1, 260)
self._add_inquiry(territory='SE', product_group='photo-wallpaper')
response = self.client.get('/prices/inquiry/1?width=100&height=100')
self._add_material("standard-wallpaper", 1, 236)
self._add_material("premium-wallpaper", 1, 260)
self._add_inquiry(territory="SE", product_group="photo-wallpaper")
response = self.client.get("/prices/inquiry/1?width=100&height=100")
self.assert200(response)
self.assertEqual('wallpaper', response.json['group'])
self.assertEqual("wallpaper", response.json["group"])
def test_inquiry_canvas(self):
self._add_material('standard-canvas', 2, 799.2)
self._add_inquiry(territory='SE', product_group='canvas')
response = self.client.get('/prices/inquiry/1?width=100&height=100')
self._add_material("standard-canvas", 2, 799.2)
self._add_inquiry(territory="SE", product_group="canvas")
response = self.client.get("/prices/inquiry/1?width=100&height=100")
self.assert200(response)
self.assertEqual('canvas', response.json['group'])
self.assertEqual("canvas", response.json["group"])
def test_inquiry_poster(self):
self._add_inquiry(territory='SE', product_group='poster')
response = self.client.get('/prices/inquiry/1?width=100&height=100')
self._add_inquiry(territory="SE", product_group="poster")
response = self.client.get("/prices/inquiry/1?width=100&height=100")
self.assert200(response)
self.assertEqual('poster', response.json['group'])
self.assertEqual("poster", response.json["group"])