mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-18 10:29:23 +02:00
refactor wizard, unit test
This commit is contained in:
parent
265609208f
commit
2586f10342
2 changed files with 49 additions and 13 deletions
|
@ -102,6 +102,28 @@ class DomainRequestTests(TestWithUser, WebTest):
|
||||||
|
|
||||||
self.assertContains(type_page, "You cannot submit this request yet")
|
self.assertContains(type_page, "You cannot submit this request yet")
|
||||||
|
|
||||||
|
def test_domain_request_into_acknowledgement_creates_new_request(self):
|
||||||
|
"""
|
||||||
|
We had to solve a bug where the wizard was creating 2 requests on first intro acknowledgement ('continue')
|
||||||
|
The wizard was also creating multiiple requests on 'continue' -> back button -> 'continue' etc.
|
||||||
|
|
||||||
|
This tests that the domain requests get created only when they should.
|
||||||
|
"""
|
||||||
|
intro_page = self.app.get(reverse("domain-request:"))
|
||||||
|
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
|
||||||
|
intro_form = intro_page.forms[0]
|
||||||
|
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||||
|
intro_result = intro_form.submit()
|
||||||
|
|
||||||
|
# follow first redirect
|
||||||
|
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||||
|
intro_result.follow()
|
||||||
|
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
|
||||||
|
|
||||||
|
# should see results in db
|
||||||
|
domain_request_count = DomainRequest.objects.count()
|
||||||
|
self.assertEqual(domain_request_count, 1)
|
||||||
|
|
||||||
@boto3_mocking.patching
|
@boto3_mocking.patching
|
||||||
def test_domain_request_form_submission(self):
|
def test_domain_request_form_submission(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import logging
|
import logging
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
|
import time
|
||||||
from django.http import Http404, HttpResponse, HttpResponseRedirect
|
from django.http import Http404, HttpResponse, HttpResponseRedirect
|
||||||
from django.shortcuts import redirect, render
|
from django.shortcuts import redirect, render
|
||||||
from django.urls import resolve, reverse
|
from django.urls import resolve, reverse
|
||||||
|
@ -219,22 +220,22 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
|
||||||
self.storage["domain_request_id"] = kwargs["id"]
|
self.storage["domain_request_id"] = kwargs["id"]
|
||||||
self.storage["step_history"] = self.db_check_for_unlocking_steps()
|
self.storage["step_history"] = self.db_check_for_unlocking_steps()
|
||||||
|
|
||||||
# if accessing this class directly, redirect to the first step
|
# if accessing this class directly, redirect to either to an acknowledgement
|
||||||
# in other words, if `DomainRequestWizard` is called as view
|
# page or to the first step in the processes (if an edit rather than a new request);
|
||||||
# directly by some redirect or url handler, we'll send users
|
# subclasseswill NOT be redirected. The purpose of this is to allow code to
|
||||||
# either to an acknowledgement page or to the first step in
|
# send users "to the domain request wizard" without needing to know which view
|
||||||
# the processes (if an edit rather than a new request); subclasses
|
# is first in the list of steps.
|
||||||
# will NOT be redirected. The purpose of this is to allow code to
|
|
||||||
# send users "to the domain request wizard" without needing to
|
|
||||||
# know which view is first in the list of steps.
|
|
||||||
context = self.get_context_data()
|
|
||||||
if self.__class__ == DomainRequestWizard:
|
if self.__class__ == DomainRequestWizard:
|
||||||
if request.path_info == self.NEW_URL_NAME:
|
if request.path_info == self.NEW_URL_NAME:
|
||||||
context = self.get_context_data()
|
# del self.storage
|
||||||
return render(request, "domain_request_intro.html", context=context)
|
# Clear context so the prop getter won't create a request here.
|
||||||
|
# Creating a request will be handled in the post method for the
|
||||||
|
# intro page.
|
||||||
|
return render(request, "domain_request_intro.html", context={})
|
||||||
else:
|
else:
|
||||||
return self.goto(self.steps.first)
|
return self.goto(self.steps.first)
|
||||||
|
|
||||||
|
context = self.get_context_data()
|
||||||
self.steps.current = current_url
|
self.steps.current = current_url
|
||||||
context["forms"] = self.get_forms()
|
context["forms"] = self.get_forms()
|
||||||
|
|
||||||
|
@ -457,11 +458,24 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
|
||||||
|
|
||||||
# which button did the user press?
|
# which button did the user press?
|
||||||
button: str = request.POST.get("submit_button", "")
|
button: str = request.POST.get("submit_button", "")
|
||||||
|
current_time = time.time()
|
||||||
|
|
||||||
# if user has acknowledged the intro message
|
# if user has acknowledged the intro message
|
||||||
if button == "intro_acknowledge":
|
if button == "intro_acknowledge":
|
||||||
|
print("intro_acknowledge")
|
||||||
if request.path_info == self.NEW_URL_NAME:
|
if request.path_info == self.NEW_URL_NAME:
|
||||||
del self.storage
|
print("Creating DomainRequest...")
|
||||||
|
last_submit_time = request.session.get('last_submit_time', 0)
|
||||||
|
|
||||||
|
# Check if the last submit was very recent, indicating a back button -> submit sequence
|
||||||
|
if current_time - last_submit_time > 5: # 5 seconds threshold
|
||||||
|
|
||||||
|
# This will trigger the domain_request getter into creating a new DomainRequest
|
||||||
|
del self.storage
|
||||||
|
|
||||||
|
# Update the last submit time
|
||||||
|
request.session['last_submit_time'] = current_time
|
||||||
|
|
||||||
return self.goto(self.steps.first)
|
return self.goto(self.steps.first)
|
||||||
|
|
||||||
# if accessing this class directly, redirect to the first step
|
# if accessing this class directly, redirect to the first step
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue