Merge pull request #3521 from mmerickel/remove-check-csrf-predicate

remove check_csrf view predicate

2 files changed, 0 insertions, 67 deletions

diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 28b7a9fb1..a1e975756 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -1886,24 +1886,6 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         request.upath_info = text_('/')
         self._assertNotFound(wrapper, None, request)
 
-    def test_add_view_with_check_csrf_predicates_match(self):
-        import warnings
-        from pyramid.renderers import null_renderer
-
-        view = lambda *arg: 'OK'
-        config = self._makeOne(autocommit=True)
-        with warnings.catch_warnings(record=True) as w:
-            warnings.filterwarnings('always')
-            config.add_view(view=view, check_csrf=True, renderer=null_renderer)
-            self.assertEqual(len(w), 1)
-        wrapper = self._getViewCallable(config)
-        request = self._makeRequest(config)
-        request.method = "POST"
-        request.session = DummySession({'csrf_token': 'foo'})
-        request.POST = {'csrf_token': 'foo'}
-        request.headers = {}
-        self.assertEqual(wrapper(None, request), 'OK')
-
     def test_add_view_with_custom_predicates_match(self):
         import warnings
         from pyramid.renderers import null_renderer
diff --git a/tests/test_predicates.py b/tests/test_predicates.py
index 60e36047e..4029faf9d 100644
--- a/tests/test_predicates.py
+++ b/tests/test_predicates.py
@@ -315,55 +315,6 @@ class TestTraversePredicate(unittest.TestCase):
         self.assertEqual(inst.phash(), '')
 
 
-class Test_CheckCSRFTokenPredicate(unittest.TestCase):
-    def _makeOne(self, val, config):
-        from pyramid.predicates import CheckCSRFTokenPredicate
-
-        return CheckCSRFTokenPredicate(val, config)
-
-    def test_text(self):
-        inst = self._makeOne(True, None)
-        self.assertEqual(inst.text(), 'check_csrf = True')
-
-    def test_phash(self):
-        inst = self._makeOne(True, None)
-        self.assertEqual(inst.phash(), 'check_csrf = True')
-
-    def test_it_call_val_True(self):
-        inst = self._makeOne(True, None)
-        request = Dummy()
-
-        def check_csrf_token(req, val, raises=True):
-            self.assertEqual(req, request)
-            self.assertEqual(val, 'csrf_token')
-            self.assertEqual(raises, False)
-            return True
-
-        inst.check_csrf_token = check_csrf_token
-        result = inst(None, request)
-        self.assertEqual(result, True)
-
-    def test_it_call_val_str(self):
-        inst = self._makeOne('abc', None)
-        request = Dummy()
-
-        def check_csrf_token(req, val, raises=True):
-            self.assertEqual(req, request)
-            self.assertEqual(val, 'abc')
-            self.assertEqual(raises, False)
-            return True
-
-        inst.check_csrf_token = check_csrf_token
-        result = inst(None, request)
-        self.assertEqual(result, True)
-
-    def test_it_call_val_False(self):
-        inst = self._makeOne(False, None)
-        request = Dummy()
-        result = inst(None, request)
-        self.assertEqual(result, True)
-
-
 class TestHeaderPredicate(unittest.TestCase):
     def _makeOne(self, val):
         from pyramid.predicates import HeaderPredicate