Nebucatnetzer
/
network_inventory
mirror of https://github.com/Nebucatnetzer/network_inventory.git
1
0
Fork 0
Code Issues Releases Wiki Activity

move the string conversion to the helper function

This commit is contained in:
Andreas Zweili 2019-12-28 15:37:09 +01:00
parent d6be5cea55
commit 6e84d26e0f
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network_inventory/inventory/tests/helper.py
View File

@ -1,12 +1,12 @@
def in_content(response, string):
def in_content(response, object_to_find):
decoded_content = response.content.decode('utf8')
if string not in decoded_content:
if str(object_to_find) not in decoded_content:
return False
return True
def not_in_content(response, string):
def not_in_content(response, object_to_find):
decoded_content = response.content.decode('utf8')
if string in decoded_content:
if str(object_to_find) in decoded_content:
return False
return True

2
network_inventory/inventory/tests/test_views/test_backup_detail_view.py
View File

@ -20,7 +20,7 @@ def test_backup_detail_view(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/backup/' + str(backup.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, backup.name))
and helper.in_content(response, backup))
def test_backup_detail_view_not_found(create_admin_user):

4
network_inventory/inventory/tests/test_views/test_computer_detail_view.py
View File

@ -20,7 +20,7 @@ def test_computer_detail_view(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, str(computer)))
and helper.in_content(response, computer))
def test_computer_detail_view_not_found(create_admin_user):
@ -66,7 +66,7 @@ def test_computer_detail_view_cpu_relation(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, str(cpu)))
and helper.in_content(response, cpu))
def test_computer_detail_view_no_permission(create_admin_user):

2
network_inventory/inventory/tests/test_views/test_computer_list_view.py
View File

@ -28,4 +28,4 @@ def test_computer_list_view(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/computers/all/')
assert (response.status_code == 200
and helper.in_content(response, computer.name))
and helper.in_content(response, computer))

4
network_inventory/inventory/tests/test_views/test_customer_backup_table_view.py
View File

@ -57,5 +57,5 @@ def test_customer_backup_table_with_multiple_backups(create_admin_user):
backup2 = mixer.blend('inventory.Backup', computer=computer)
response = client.get('/customer/' + str(customer.id) + '/backups/')
assert (response.status_code == 200
and helper.in_content(response, backup1.name)
and helper.in_content(response, backup2.name))
and helper.in_content(response, backup1)
and helper.in_content(response, backup2))

2
network_inventory/inventory/tests/test_views/test_customer_computer_table_view.py
View File

@ -22,7 +22,7 @@ def test_customer_computer_table(create_admin_user):
computer = mixer.blend('inventory.Computer', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/computers/')
assert (response.status_code == 200
and helper.in_content(response, computer.name))
and helper.in_content(response, computer))
def test_customer_computer_table_no_computer(create_admin_user):

2
network_inventory/inventory/tests/test_views/test_customer_detail_view.py
View File

@ -29,7 +29,7 @@ def test_customer_detail_view(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, customer.name))
and helper.in_content(response, customer))
def test_customer_detail_view_no_permissions():

2
network_inventory/inventory/tests/test_views/test_customer_device_table_view.py
View File

@ -22,7 +22,7 @@ def test_customer_device_table(create_admin_user):
device = mixer.blend('inventory.Device', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/devices/')
assert (response.status_code == 200
and helper.in_content(response, device.name))
and helper.in_content(response, device))
def test_customer_device_table_no_device(create_admin_user):

2
network_inventory/inventory/tests/test_views/test_customer_net_table_view.py
View File

@ -22,7 +22,7 @@ def test_customer_net_table(create_admin_user):
net = mixer.blend('inventory.Net', customer=mixer.SELECT)
response = client.get('/customer/' + str(net.customer.id) + '/nets/')
assert (response.status_code == 200
and helper.in_content(response, net.name))
and helper.in_content(response, net))
def test_customer_net_table_no_net(create_admin_user):

14
network_inventory/inventory/tests/test_views/test_device_detail_view.py
View File

@ -28,13 +28,13 @@ def test_device_detail_view(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/device/' + str(device.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, str(device))
and helper.in_content(response, str(device.serialnumber))
and helper.in_content(response, str(device.category))
and helper.in_content(response, str(device.owner))
and helper.in_content(response, str(device.customer))
and helper.in_content(response, str(device.manufacturer))
and helper.in_content(response, str(device.location)))
and helper.in_content(response, device)
and helper.in_content(response, device.serialnumber)
and helper.in_content(response, device.category)
and helper.in_content(response, device.owner)
and helper.in_content(response, device.customer)
and helper.in_content(response, device.manufacturer)
and helper.in_content(response, device.location))
def test_device_detail_view_not_found(create_admin_user):

2
network_inventory/inventory/tests/test_views/test_net_detail_view.py
View File

@ -35,7 +35,7 @@ def test_net_detail_view(create_admin_user):
client.login(username="novartis-admin", password="password")
response = client.get('/net/' + str(net.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, net.name)
and helper.in_content(response, net)
and helper.in_content(response, device_in_net.ip))