From 9014f2b0dd86763e7b3ccdf9a2be7c0a46acb4b8 Mon Sep 17 00:00:00 2001 From: Frank Wiles Date: Fri, 1 Jun 2018 06:46:29 -0500 Subject: [PATCH] Re-enable Trace method --- test_plus/test.py | 16 ++++++++++------ test_project/test_app/tests.py | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/test_plus/test.py b/test_plus/test.py index dc1345a..84decd9 100644 --- a/test_plus/test.py +++ b/test_plus/test.py @@ -1,3 +1,7 @@ +import django + +from distutils.version import LooseVersion + from django.conf import settings from django.contrib.auth import get_user_model from django.contrib.auth.models import Permission @@ -151,12 +155,12 @@ def patch(self, url_name, *args, **kwargs): def head(self, url_name, *args, **kwargs): return self.request('head', url_name, *args, **kwargs) - # def trace(self, url_name, *args, **kwargs): - # if LooseVersion(django.get_version()) >= LooseVersion('1.8.2'): - # return self.request('trace', url_name, *args, **kwargs) - # else: - # raise LookupError("client.trace is not available for your version of django. Please\ - # update your django version.") + def trace(self, url_name, *args, **kwargs): + if LooseVersion(django.get_version()) >= LooseVersion('1.8.2'): + return self.request('trace', url_name, *args, **kwargs) + else: + raise LookupError("client.trace is not available for your version of django. Please\ + update your django version.") def options(self, url_name, *args, **kwargs): return self.request('options', url_name, *args, **kwargs) diff --git a/test_project/test_app/tests.py b/test_project/test_app/tests.py index 9d866b8..d369bcd 100644 --- a/test_project/test_app/tests.py +++ b/test_project/test_app/tests.py @@ -165,19 +165,19 @@ def test_head_follow(self): res = self.head(url, follow=True) self.assertTrue(res.status_code, 200) - # def test_trace(self): - # url = self.reverse('view-200') - # res = self.trace(url) - # self.assertTrue(res.status_code, 200) - # - # def test_trace_follow(self): - # url = self.reverse('view-redirect') - # # Expect 302 status code - # res = self.trace(url) - # self.assertTrue(res.status_code, 302) - # # Expect 200 status code - # res = self.trace(url, follow=True) - # self.assertTrue(res.status_code, 200) + def test_trace(self): + url = self.reverse('view-200') + res = self.trace(url) + self.assertTrue(res.status_code, 200) + + def test_trace_follow(self): + url = self.reverse('view-redirect') + # Expect 302 status code + res = self.trace(url) + self.assertTrue(res.status_code, 302) + # Expect 200 status code + res = self.trace(url, follow=True) + self.assertTrue(res.status_code, 200) def test_options(self): url = self.reverse('view-200')