diff --git a/cypress/e2e/sign-in.cy.js b/cypress/e2e/sign-in.cy.js index f92b43c3..4be65ef0 100644 --- a/cypress/e2e/sign-in.cy.js +++ b/cypress/e2e/sign-in.cy.js @@ -1,7 +1,6 @@ describe('Sign-In Stories', function() { beforeEach(() => { - cy.visit('/accounts/logout/?next=/'); - + cy.get('#logout').click(); }); it('Sign In', function() { diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 7cbed3a6..a10b7a1d 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -24,7 +24,7 @@ // -- This will overwrite an existing command -- // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... }) Cypress.Commands.add('login', (username, password) => { - cy.visit('/accounts/logout/?next=/'); + cy.get('#logout').click(); cy.get('#guest-login').click(); cy.get('#id_username').type(username).blur(); cy.get('#id_password').type(password).blur(); diff --git a/quizcon/templates/base.html b/quizcon/templates/base.html index 8c1e2f1d..2eba89a6 100644 --- a/quizcon/templates/base.html +++ b/quizcon/templates/base.html @@ -119,8 +119,15 @@ {{request.user.first_name}} {{request.user.last_name}} {% else %} {{ request.user.username }} - {% endif %} - (logout) + {% endif %} + +
+ {% endif %} diff --git a/requirements.txt b/requirements.txt index f7802320..33fd0a5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=4.2.14,<5 +Django>=5.2,<6 pytz==2025.2 httplib2==0.31.0 feedparser==6.0.12 @@ -20,7 +20,7 @@ beautifulsoup4==4.14.3 cssselect==1.3.0 lxml==6.0.2 fuzzywuzzy==0.18.0 -sure==2.0.1 +sure==3.0a2 pyasn1==0.6.1 cryptography==46.0.3 # pyOpenSSL cffi==2.0.0