Skip to content
Snippets Groups Projects
Commit 3f0a238d authored by Todd Dembrey's avatar Todd Dembrey
Browse files

Fix the test that was not returning an absolute URL

parent 39c729be
No related branches found
No related tags found
No related merge requests found
...@@ -223,7 +223,8 @@ class TestStaffSealedView(BaseSubmissionViewTestCase): ...@@ -223,7 +223,8 @@ class TestStaffSealedView(BaseSubmissionViewTestCase):
def test_cant_post_to_sealed(self): def test_cant_post_to_sealed(self):
submission = SealedSubmissionFactory() submission = SealedSubmissionFactory()
response = self.post_page(submission, {'some': 'data'}, 'sealed') response = self.post_page(submission, {'some': 'data'}, 'sealed')
url = self.url_from_pattern('funds:submissions:sealed', kwargs={'pk': submission.id}) # Because of the redirect chain the url returned is not absolute
url = self.url_from_pattern('funds:submissions:sealed', kwargs={'pk': submission.id}, absolute=False)
self.assertRedirects(response, url) self.assertRedirects(response, url)
def test_non_sealed_unaffected(self): def test_non_sealed_unaffected(self):
......
...@@ -32,17 +32,14 @@ class BaseViewTestCase(TestCase): ...@@ -32,17 +32,14 @@ class BaseViewTestCase(TestCase):
def url(self, instance, view_name=None, absolute=True): def url(self, instance, view_name=None, absolute=True):
full_url_name = self.url_name.format(view_name or self.base_view_name) full_url_name = self.url_name.format(view_name or self.base_view_name)
url = reverse(full_url_name, kwargs=self.get_kwargs(instance)) return self.url_from_pattern(full_url_name, self.get_kwargs(instance), secure=True, absolute=absolute)
if not absolute:
return url
request = self.factory.get(url, secure=True) def url_from_pattern(self, pattern, kwargs=None, secure=True, absolute=True):
return request.build_absolute_uri()
def url_from_pattern(self, pattern, kwargs=None):
url = reverse(pattern, kwargs=kwargs) url = reverse(pattern, kwargs=kwargs)
request = self.factory.get(url, secure=True) request = self.factory.get(url, secure=secure)
return request.build_absolute_uri() if absolute:
return request.build_absolute_uri()
return request.path
def get_page(self, instance=None, view_name=None): def get_page(self, instance=None, view_name=None):
return self.client.get(self.url(instance, view_name), secure=True, follow=True) return self.client.get(self.url(instance, view_name), secure=True, follow=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment