Skip to content

Commit

Permalink
Fix 1.8 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcarlander
tcarlander committed Mar 23, 2017
1 parent 412615a commit 26b6b7b
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ after_success:
- coveralls
matrix:
allow_failures:
- env: DJANGO=1.8
- env: DJANGO=1.11
139 changes: 139 additions & 0 deletions hello_crowd/tests/test_login.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import django
from django.test import TestCase
import unittest

try:
from unittest.mock import patch, Mock
Expand Down Expand Up @@ -121,6 +123,7 @@ def setUp(self):
self.mock_requests_delete = patch_requests_delete.start()
self.addCleanup(patch_requests_delete.stop)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_not_logged_in(self):
response = self.client.get('/admin/')
self.assertEqual(response.status_code, 302)
Expand All @@ -130,6 +133,7 @@ def test_get_homepage_no_login(self):
response = self.client.get('/')
self.assertEqual(response.status_code, 200)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_get_homepage_login_req(self):
response = self.client.get('/l')
self.assertEqual(response.status_code, 302)
Expand All @@ -144,6 +148,7 @@ def test_get_homepage_login_req(self):
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], '/l')

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_login_sucsessful_with_existing_crowd_user(self):
r = Mock()
r.status_code = 201
Expand All @@ -157,6 +162,7 @@ def test_login_sucsessful_with_existing_crowd_user(self):
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_login_sucsessful_with_existing_crowd_user_using_email(self):
r = Mock()
r.status_code = 201
Expand All @@ -171,6 +177,7 @@ def test_login_sucsessful_with_existing_crowd_user_using_email(self):
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_login_sucsessful_with_non_existing_crowd_user(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
Expand All @@ -183,6 +190,7 @@ def test_login_sucsessful_with_non_existing_crowd_user(self):
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_login_sucsessful_with_non_existing_crowd_user_using_email(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
Expand All @@ -196,6 +204,137 @@ def test_login_sucsessful_with_non_existing_crowd_user_using_email(self):
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_login_sucsessful_with_non_existing_crowd_user(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
self.mock_requests_post.return_value = r
response = self.client.post('/admin/login/?next=/admin/', {'username': 'admin', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], '/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipIf(django.VERSION[:2], (1, 8))
def test_login_sucsessful_with_non_existing_crowd_user_using_email(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
self.mock_requests_post.return_value = r
response = self.client.post('/admin/login/?next=/admin/',
{'username': 'admin@test.com', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], '/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_not_logged_in(self):
response = self.client.get('/admin/')
self.assertEqual(response.status_code, 302)
self.assertEqual(response['location'], 'http://testserver/admin/login/?next=/admin/')

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_get_homepage_login_req(self):
response = self.client.get('/l')
self.assertEqual(response.status_code, 302)
self.assertEqual(response['location'], 'http://testserver/admin/login/?next=/l')
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
mock_local_user('admin')
self.mock_requests_post.return_value = r
self.mock_requests_get.side_effect = mock_get_response
response = self.client.post('/admin/login/?next=/l', {'username': 'admin', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/l')

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_login_sucsessful_with_existing_crowd_user(self):
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
mock_local_user('admin')
self.mock_requests_post.return_value = r
self.mock_requests_get.side_effect = mock_get_response
response = self.client.post('/admin/login/?next=/admin/', {'username': 'admin', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_login_sucsessful_with_existing_crowd_user_using_email(self):
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
mock_local_user('admin')
self.mock_requests_post.return_value = r
self.mock_requests_get.side_effect = mock_get_response
response = self.client.post('/admin/login/?next=/admin/',
{'username': 'admin@test.com', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_login_sucsessful_with_non_existing_crowd_user(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
self.mock_requests_post.return_value = r
response = self.client.post('/admin/login/?next=/admin/', {'username': 'admin', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_login_sucsessful_with_non_existing_crowd_user_using_email(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
self.mock_requests_post.return_value = r
response = self.client.post('/admin/login/?next=/admin/',
{'username': 'admin@test.com', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_login_sucsessful_with_non_existing_crowd_user(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
self.mock_requests_post.return_value = r
response = self.client.post('/admin/login/?next=/admin/', {'username': 'admin', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

@unittest.skipUnless(django.VERSION[:2] < (1, 8), "Only In 1.8")
def test_login_sucsessful_with_non_existing_crowd_user_using_email(self):
self.mock_requests_get.side_effect = mock_get_response
r = Mock()
r.status_code = 201
r.json.return_value = {"token": "VALID_TOKEN"}
self.mock_requests_post.return_value = r
response = self.client.post('/admin/login/?next=/admin/',
{'username': 'admin@test.com', 'password': '55555555'})
self.assertEqual(response.status_code, 302)
self.assertEqual(response['Location'], 'http://testserver/admin/')
response2 = self.client.get('/admin/')
self.assertEqual(response2.status_code, 200)

def test_sso_login_new_user(self):
self.client.cookies['crowd.token_key'] = 'VALID_TOKEN'
self.mock_requests_get.side_effect = mock_get_response
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ deps =
django18: Django <1.9
django19: Django >=1.9,<1.10
django110: Django >=1.10,<1.11
django111: Django >=1.11<1.12
django111: django>=1.11b1,<1.12
djangomaster: https://github.com/django/django/archive/master.tar.gz
requests
djangorestframework
Expand Down

0 comments on commit 26b6b7b

Please sign in to comment.