Merge branch 'master' of git.2li.ch:Nebucatnetzer/network_inventory

This commit is contained in:
Andreas Zweili 2020-03-20 12:01:04 +01:00
commit 1e38098f53
22 changed files with 96 additions and 100 deletions

View File

@ -1,2 +1,8 @@
[flake8]
exclude = *migrations*,__init__.py,*cache*,venv/,manage.py,network_inventory/settings/*
exclude =
*migrations*,
__init__.py,
*cache*,
venv/,
manage.py,
network_inventory/settings/*

4
.gitignore vendored
View File

@ -174,5 +174,5 @@ migrations/
htmlcov/
.second_run
network_inventory/network_inventory/static/
!network_inventory/network_inventory/static/core
network_inventory/static/
!network_inventory/static/core

View File

@ -18,7 +18,7 @@ def test_backup_detail_view(create_admin_user):
mixer.blend('computers.Computer', customer=mixer.SELECT)
backup = mixer.blend('backups.Backup', computer=mixer.SELECT)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/backup/' + str(backup.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, backup))
@ -27,16 +27,16 @@ def test_backup_detail_view(create_admin_user):
def test_backup_detail_view_not_found(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/backup/100/')
assert response.status_code == 404
def test_customer_computer_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('computers.Computer', customer=customer)
backup = mixer.blend('backups.Backup', computer=mixer.SELECT)
response = client.get('/backup/' + str(backup.id) + '/')
@ -52,7 +52,7 @@ def test_backup_detail_view_with_target_device(create_admin_user):
mixer.blend('backups.TargetDevice', device=target_computer,
backup=mixer.SELECT)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/backup/' + str(backup.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, backup)
@ -68,7 +68,7 @@ def test_backup_detail_view_with_notification(create_admin_user):
backup=backup,
notification=notification)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/backup/' + str(backup.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, notification))

View File

@ -19,7 +19,7 @@ def test_customer_backup_table(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
computer = mixer.blend('computers.Computer', customer=customer)
backup = mixer.blend('backups.Backup', computer=computer)
response = client.get('/customer/' + str(customer.id) + '/backups/')
@ -31,16 +31,16 @@ def test_customer_backup_table_no_backup(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/backups/')
assert response.status_code == 200
def test_customer_backup_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
computer = mixer.blend('computers.Computer', customer=customer)
mixer.blend('backups.Backup', computer=computer)
response = client.get('/customer/' + str(customer.id) + '/backups/')
@ -51,7 +51,7 @@ def test_customer_backup_table_with_multiple_backups(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
computer = mixer.blend('computers.Computer', customer=customer)
backup1 = mixer.blend('backups.Backup', computer=computer)
backup2 = mixer.blend('backups.Backup', computer=computer)

View File

@ -18,7 +18,7 @@ def test_computer_detail_view(create_admin_user):
computer = mixer.blend('computers.Computer', customer=mixer.SELECT,
os=mixer.SELECT)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, computer))
@ -27,7 +27,7 @@ def test_computer_detail_view(create_admin_user):
def test_computer_detail_view_not_found(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computer/230/')
assert response.status_code == 404
@ -39,7 +39,7 @@ def test_computer_detail_view_ram_relation(create_admin_user):
ram = mixer.blend('computers.Ram', ram_type=ram_type)
mixer.blend('computers.ComputerRamRelation', computer=computer, ram=ram)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, "RAM Modules:"))
@ -55,7 +55,7 @@ def test_computer_detail_view_raid_relation(create_admin_user):
raid_type=raid_type)
mixer.blend('computers.DisksInRaid', raid=raid, disk=disk)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert response.status_code == 200 and helper.in_content(response, "RAID")
@ -66,7 +66,7 @@ def test_computer_detail_view_cpu_relation(create_admin_user):
cpu = mixer.blend('computers.Cpu', cpu_typ=mixer.SELECT)
mixer.blend('computers.ComputerCpuRelation', cpu=cpu, computer=computer)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, cpu))
@ -77,6 +77,6 @@ def test_computer_detail_view_no_permission(create_admin_user):
customer = mixer.blend('customers.Customer')
computer = mixer.blend('computers.Computer', customer=customer)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computer/' + str(computer.id) + '/')
assert response.status_code == 403

View File

@ -16,7 +16,7 @@ def test_computer_list_view_not_logged_in():
def test_computer_list_view_no_computers(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computers/all/')
assert response.status_code == 200
@ -25,7 +25,7 @@ def test_computer_list_view(create_admin_user):
create_admin_user()
computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/computers/all/')
assert (response.status_code == 200
and helper.in_content(response, computer))

View File

@ -18,7 +18,7 @@ def test_customer_computer_table(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
computer = mixer.blend('computers.Computer', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/computers/')
assert (response.status_code == 200
@ -29,17 +29,17 @@ def test_customer_computer_table_no_computer(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/computers/')
assert (response.status_code == 200
and helper.not_in_content(response, "Novartis PC"))
and helper.not_in_content(response, "Pharma Corp. PC"))
def test_customer_computer_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('computers.Computer', customer=customer)
response = client.get('/customer/' + str(customer.id) + '/computers/')
assert response.status_code == 403
@ -49,7 +49,7 @@ def test_customer_computer_table_multiple_computers(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
computer1 = mixer.blend('computers.Computer', customer=mixer.SELECT)
computer2 = mixer.blend('computers.Computer', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/computers/')

View File

@ -13,13 +13,13 @@ def test_computer_create_form(create_admin_user):
assert form.is_valid() is False, (
"Should be false because no data was given")
data = {"name": "novartis-pc1",
data = {"name": "pharma-pc1",
"customer": 3}
form = forms.ComputerCreateForm(user=user, data=data)
assert form.is_valid() is False, (
"Should be false because the customer doesn't exist.")
data = {"name": "novartis-pc1",
data = {"name": "pharma-pc1",
"customer": fixture['customer'].id}
form = forms.ComputerCreateForm(user=fixture['admin'], data=data)
assert form.is_valid() is True, ("Should be valid with the given data.")
@ -32,13 +32,13 @@ def test_computer_update_form(create_admin_user):
assert form.is_valid() is False, (
"Should be false because no data was given")
data = {"name": "novartis-pc1",
data = {"name": "pharma-pc1",
"customer": 3}
form = forms.ComputerUpdateForm(user=user, data=data)
assert form.is_valid() is False, (
"Should be false because the customer doesn't exist.")
data = {"name": "novartis-pc1",
data = {"name": "pharma-pc1",
"customer": fixture['customer'].id}
form = forms.ComputerUpdateForm(user=fixture['admin'], data=data)
assert form.is_valid() is True, ("Should be valid with the given data.")

View File

@ -22,12 +22,12 @@ def django_db_setup(django_db_setup, django_db_blocker):
def create_admin_user():
def _create_admin_user():
User = get_user_model()
admin = User.objects.create_user("novartis-admin",
"admin@novartis.com",
admin = User.objects.create_user("pharma-admin",
"admin@pharma.com",
"password",
is_staff=True)
customer = mixer.blend('customers.Customer')
group = Group.objects.create(name="Novartis Admin")
group = Group.objects.create(name="Pharma Corp. Admin")
admin.groups.add(group)
assign_perm('view_customer', admin, customer)
result = {}

View File

@ -1,10 +0,0 @@
from django.http import Http404
def superuser_required(old_function):
def new_function(request, *args, **kwargs):
if request.user.is_superuser:
return old_function(request)
else:
raise Http404
return new_function

View File

@ -17,7 +17,7 @@ def test_customer_detail_view_not_logged_in():
def test_customer_detail_view_not_found(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/230/')
assert response.status_code == 404
@ -26,7 +26,7 @@ def test_customer_detail_view(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, customer))
@ -34,10 +34,10 @@ def test_customer_detail_view(create_admin_user):
def test_customer_detail_view_no_permissions():
User = get_user_model()
User.objects.create_user("novartis-admin", "admin@novartis.com",
User.objects.create_user("pharma-admin", "admin@pharma.com",
"password", is_staff=True)
client = Client()
customer = mixer.blend('customers.Customer')
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/')
assert response.status_code == 302 and 'login' in response.url

View File

@ -18,10 +18,10 @@ def test_customer_list_view_not_logged_in():
def test_customer_list_view_no_customer():
User = get_user_model()
User.objects.create_user("novartis-admin", "admin@novartis.com",
User.objects.create_user("pharma-admin", "admin@pharma.com",
"password", is_staff=True)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/')
assert response.status_code == 200
@ -30,7 +30,7 @@ def test_customer_list_view(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/')
assert (response.status_code == 200
and helper.in_content(response, customer)
@ -70,7 +70,7 @@ def test_customer_list_view_multiple_customers(create_admin_user):
customer2 = mixer.blend('customers.Customer')
assign_perm('view_customer', fixture['admin'], customer2)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/')
assert (response.status_code == 200
and helper.in_content(response, customer1)

View File

@ -16,7 +16,7 @@ def test_connected_device_detail_view_not_logged_in():
def test_connected_device_detail_view_not_found(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/connected_device/100/')
assert response.status_code == 404
@ -27,7 +27,7 @@ def test_connected_device_detail_view_no_permission(create_admin_user):
connected_device = mixer.blend('devices.ConnectedDevice',
customer=customer)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/connected_device/'
+ str(connected_device.id)
+ '/')
@ -48,7 +48,7 @@ def test_connected_device_detail_view_net_relation(create_admin_user):
net=net2,
ip="10.8.89.100")
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/connected_device/' + str(device.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, device_in_net1.ip)

View File

@ -18,7 +18,7 @@ def test_customer_device_table(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
device = mixer.blend('devices.ConnectedDevice', customer=mixer.SELECT)
response = client.get('/customer/'
+ str(customer.id)
@ -31,19 +31,19 @@ def test_customer_device_table_no_device(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/'
+ str(customer.id)
+ '/connected_devices/')
assert (response.status_code == 200
and helper.not_in_content(response, "Novartis PC"))
and helper.not_in_content(response, "Pharma Corp. PC"))
def test_customer_device_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('devices.ConnectedDevice', customer=customer)
response = client.get('/customer/'
+ str(customer.id)
@ -55,7 +55,7 @@ def test_customer_device_table_multiple_devices(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
device1 = mixer.blend('devices.ConnectedDevice', customer=mixer.SELECT)
device2 = mixer.blend('devices.ConnectedDevice', customer=mixer.SELECT)
response = client.get('/customer/'

View File

@ -18,7 +18,7 @@ def test_customer_device_table(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
device = mixer.blend('devices.Device', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/devices/')
assert (response.status_code == 200
@ -29,17 +29,17 @@ def test_customer_device_table_no_device(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/devices/')
assert (response.status_code == 200
and helper.not_in_content(response, "Novartis PC"))
and helper.not_in_content(response, "Pharma Corp. PC"))
def test_customer_device_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('devices.Device', customer=customer)
response = client.get('/customer/' + str(customer.id) + '/devices/')
assert response.status_code == 403
@ -49,7 +49,7 @@ def test_customer_device_table_multiple_devices(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
device1 = mixer.blend('devices.Device', customer=mixer.SELECT)
device2 = mixer.blend('devices.Device', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/devices/')

View File

@ -27,7 +27,7 @@ def test_device_detail_view(create_admin_user):
hardware_model=mixer.SELECT,
location=mixer.SELECT)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/device/' + str(device.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, device)
@ -43,7 +43,7 @@ def test_device_detail_view(create_admin_user):
def test_device_detail_view_not_found(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/device/100/')
assert response.status_code == 404
@ -53,7 +53,7 @@ def test_device_detail_view_no_permission(create_admin_user):
customer = mixer.blend('customers.Customer')
device = mixer.blend('devices.Device', customer=customer)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/device/' + str(device.id) + '/')
assert response.status_code == 403
@ -64,7 +64,7 @@ def test_device_detail_view_warranty(create_admin_user):
warranty = mixer.blend('devices.Warranty',
device=device)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/device/' + str(device.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, warranty.duration_in_years))

View File

@ -21,7 +21,7 @@ def test_warranties_no_warranties_found(create_admin_user):
customer = mixer.blend('customers.Customer')
device = mixer.blend('devices.Device', customer=customer)
warranty = mixer.blend('devices.Warranty', device=device)
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/warranties/')
assert (response.status_code == 200
and helper.not_in_content(response, warranty.customer))
@ -32,7 +32,7 @@ def test_warranties_view_warranty_expired(create_admin_user):
device = mixer.blend('devices.Device', customer=fixture['customer'])
mixer.blend('devices.Warranty', device=device, valid_until="1970-01-01")
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/warranties/')
assert (response.status_code == 200
and ('bgcolor="red"' in response.content.decode('utf8')))
@ -49,7 +49,7 @@ def test_warranties_view_warranty_one_year_till_expiration(create_admin_user):
device=device,
valid_until=not_one_year_more)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/warranties/')
assert (response.status_code == 200
and ('bgcolor="orange"' in response.content.decode('utf8')))

View File

@ -19,7 +19,7 @@ def test_customer_license_table(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
license = mixer.blend('licenses.UserLicense', customer=customer,
software=mixer.SELECT, key=mixer.RANDOM,
max_allowed_users=mixer.RANDOM)
@ -34,7 +34,7 @@ def test_customer_license_table_no_license(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/licenses/')
assert (response.status_code == 200
and helper.not_in_content(response, customer))
@ -42,9 +42,9 @@ def test_customer_license_table_no_license(create_admin_user):
def test_customer_license_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('licenses.UserLicense', customer=customer)
response = client.get('/customer/' + str(customer.id) + '/licenses/')
assert response.status_code == 403
@ -56,7 +56,7 @@ def test_customer_license_table_multiple_licenses(create_admin_user):
user1 = mixer.blend('users.User')
user2 = mixer.blend('users.User')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
license1 = mixer.blend('licenses.UserLicense', customer=customer,
software=mixer.SELECT, key=mixer.RANDOM,
max_allowed_users=mixer.RANDOM)

View File

@ -18,7 +18,7 @@ def test_customer_net_table_not_logged_in():
def test_customer_net_table(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
net = mixer.blend('nets.Net', customer=mixer.SELECT)
response = client.get('/customer/' + str(net.customer.id) + '/nets/')
assert (response.status_code == 200
@ -29,16 +29,16 @@ def test_customer_net_table_no_net(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/nets/')
assert response.status_code == 200
def test_customer_net_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('nets.Net', customer=customer)
response = client.get('/customer/' + str(customer.id) + '/nets/')
assert response.status_code == 403

View File

@ -20,7 +20,7 @@ def test_net_detail_view_no_permission(create_admin_user):
net=net,
ip='10.7.89.101')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/net/' + str(net.id) + '/')
assert (response.status_code == 403)
@ -32,7 +32,7 @@ def test_net_detail_view(create_admin_user):
device_in_net = DeviceInNet.objects.create(device=device,
net=net, ip='10.7.89.101')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/net/' + str(net.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, net)
@ -43,6 +43,6 @@ def test_net_detail_view_not_found(create_admin_user):
create_admin_user()
mixer.blend('nets.Net')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/net/100/')
assert response.status_code == 404

View File

@ -18,7 +18,7 @@ def test_customer_user_table(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
user = mixer.blend('users.User', customer=mixer.SELECT)
ad_group = mixer.blend('users.AdGroup')
mail_group = mixer.blend('users.MailGroup')
@ -36,7 +36,7 @@ def test_customer_user_table_no_user(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/customer/' + str(customer.id) + '/users/')
assert (response.status_code == 200
and helper.not_in_content(response, customer))
@ -44,9 +44,9 @@ def test_customer_user_table_no_user(create_admin_user):
def test_customer_user_table_no_permission(create_admin_user):
create_admin_user()
customer = Customer.objects.create(name='Nestle')
customer = Customer.objects.create(name='Water Corp.')
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
mixer.blend('users.User', customer=customer)
response = client.get('/customer/' + str(customer.id) + '/users/')
assert response.status_code == 403
@ -56,7 +56,7 @@ def test_customer_user_table_multiple_users(create_admin_user):
fixture = create_admin_user()
customer = fixture['customer']
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
user1 = mixer.blend('users.User', customer=mixer.SELECT)
user2 = mixer.blend('users.User', customer=mixer.SELECT)
response = client.get('/customer/' + str(customer.id) + '/users/')

View File

@ -17,7 +17,7 @@ def test_user_detail_view(create_admin_user):
create_admin_user()
user = mixer.blend('users.User', customer=mixer.SELECT)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, user))
@ -26,7 +26,7 @@ def test_user_detail_view(create_admin_user):
def test_user_detail_view_not_found(create_admin_user):
create_admin_user()
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/230/')
assert response.status_code == 404
@ -37,7 +37,7 @@ def test_user_detail_view_ad_group(create_admin_user):
group = mixer.blend('users.AdGroup')
mixer.blend('users.UserInAdGroup', user=user, group=group)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, "AD Groups"))
@ -49,7 +49,7 @@ def test_user_detail_view_mail_group(create_admin_user):
group = mixer.blend('users.MailGroup')
mixer.blend('users.UserInMailGroup', user=user, group=group)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, "Mail Groups"))
@ -60,7 +60,7 @@ def test_user_detail_view_mail_alias(create_admin_user):
user = mixer.blend('users.User', customer=mixer.SELECT)
mixer.blend('users.MailAlias', user=user)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, "Mail Alias"))
@ -72,7 +72,7 @@ def test_user_detail_view_license(create_admin_user):
mixer.blend('licenses.UserLicense', software=mixer.SELECT)
mixer.blend('licenses.LicenseWithUser', user=user)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, "License"))
@ -83,7 +83,7 @@ def test_user_detail_view_computer(create_admin_user):
user = mixer.blend('users.User', customer=mixer.SELECT)
computer = mixer.blend('computers.Computer', user=user)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert (response.status_code == 200
and helper.in_content(response, computer))
@ -94,6 +94,6 @@ def test_user_detail_view_no_permission(create_admin_user):
customer = mixer.blend('customers.Customer')
user = mixer.blend('users.User', customer=customer)
client = Client()
client.login(username="novartis-admin", password="password")
client.login(username="pharma-admin", password="password")
response = client.get('/user/' + str(user.id) + '/')
assert response.status_code == 403