Skip to content

Commit

Permalink
Change tests names
Browse files Browse the repository at this point in the history
  • Loading branch information
stveit committed Mar 4, 2024
1 parent 7a64d40 commit 67679a4
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
10 changes: 7 additions & 3 deletions tests/integration/web/auth/ensure_account_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
from nav.web.auth.sudo import sudo


def test_account_is_set_if_missing(session_request):
def test_account_should_be_set_if_request_does_not_already_have_an_account(
session_request,
):
assert not hasattr(session_request, "account")
ensure_account(session_request)
assert ACCOUNT_ID_VAR in session_request.session, 'Account id is not in the session'
Expand All @@ -13,15 +15,17 @@ def test_account_is_set_if_missing(session_request):
), 'Correct user not set'


def test_account_is_switched_to_default_if_locked(session_request, locked_account):
def test_account_should_be_switched_to_default_if_locked(
session_request, locked_account
):
set_account(session_request, locked_account)
ensure_account(session_request)
default_account = Account.objects.get(id=Account.DEFAULT_ACCOUNT)
assert session_request.session[ACCOUNT_ID_VAR] == default_account.id
assert session_request.account == default_account, 'Correct user not set'


def test_account_is_left_alone_if_ok(session_request, account):
def test_account_should_be_unchanged_if_ok(session_request, account):
set_account(session_request, account)
ensure_account(session_request)
assert session_request.account == account
Expand Down
8 changes: 5 additions & 3 deletions tests/integration/web/auth/logout_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@
from nav.web.auth.sudo import sudo


def test_non_sudo_logout_removes_session_data(db, session_request, admin_account):
def test_non_sudo_logout_should_remove_session_data(db, session_request, admin_account):
# login with admin acount
set_account(session_request, admin_account)
logout(session_request)
assert not hasattr(session_request, 'account')
assert ACCOUNT_ID_VAR not in session_request.session


def test_non_sudo_logout_returns_path_to_index(db, session_request, admin_account):
def test_non_sudo_logout_should_return_path_to_index(
db, session_request, admin_account
):
# login with admin acount
set_account(session_request, admin_account)
result = logout(session_request)
assert result == '/'


def test_sudo_logout_sets_session_to_original_user(
def test_sudo_logout_should_set_session_to_original_user(
db, session_request, admin_account, account
):
# login with admin acount
Expand Down
8 changes: 5 additions & 3 deletions tests/integration/web/auth/utils_test.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
from nav.web.auth.utils import set_account, clear_session


def test_clear_session_creates_new_session_id(db, session_request):
def test_clear_session_should_create_new_session_id(db, session_request):
pre_session_id = session_request.session.session_key
clear_session(session_request)
post_session_id = session_request.session.session_key
assert pre_session_id != post_session_id


def test_clear_session_removes_account_from_request(db, session_request, admin_account):
def test_clear_session_should_remove_account_from_request(
db, session_request, admin_account
):
# login with admin acount
set_account(session_request, admin_account)
assert session_request.account
clear_session(session_request)
assert not hasattr(session_request, "account")


def test_clear_session_clears_session_dict(db, session_request, admin_account):
def test_clear_session_should_clear_session_dict(db, session_request, admin_account):
set_account(session_request, admin_account)
# Make sure there is something to be deleted
assert session_request.session.keys()
Expand Down

0 comments on commit 67679a4

Please sign in to comment.