diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-02 18:32:58 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-02 18:32:58 +0100 | 
| commit | 4166727f2f45089794d420101f45710d2a251f1d (patch) | |
| tree | 832f65c963bdf615b837a4d2b66e7e60702e07d8 /archaeological_operations/tests.py | |
| parent | 44242c7775a14a5df3ff1bdff23916f52b908d25 (diff) | |
| download | Ishtar-4166727f2f45089794d420101f45710d2a251f1d.tar.bz2 Ishtar-4166727f2f45089794d420101f45710d2a251f1d.zip | |
Fix tests: evaluation of total for json results
Diffstat (limited to 'archaeological_operations/tests.py')
| -rw-r--r-- | archaeological_operations/tests.py | 26 | 
1 files changed, 13 insertions, 13 deletions
| diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 43dd57018..166e535ca 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -1263,11 +1263,11 @@ class OperationSearchTest(TestCase, OperationInitTest):          self.assertTrue(not json.loads(response.content))          c.login(username=self.username, password=self.password)          response = c.get(reverse('get-operation'), {'year': '2010'}) -        self.assertEqual(json.loads(response.content)['total'], 2) +        self.assertEqual(json.loads(response.content)['recordsTotal'], 2)          response = c.get(reverse('get-operation'),                           {'operator': self.orgas[0].pk})          result = json.loads(response.content) -        self.assertEqual(result['total'], 2) +        self.assertEqual(result['recordsTotal'], 2)      def create_relations(self):          rel1 = models.RelationType.objects.create( @@ -1292,7 +1292,7 @@ class OperationSearchTest(TestCase, OperationInitTest):          self.assertTrue(not json.loads(response.content))          c.login(username=self.username, password=self.password)          response = c.get(reverse('get-operation'), search) -        self.assertTrue(json.loads(response.content)['total'] == 2) +        self.assertTrue(json.loads(response.content)['recordsTotal'] == 2)      def testHierarchicSearch(self):          ope = self.operations[1] @@ -1315,19 +1315,19 @@ class OperationSearchTest(TestCase, OperationInitTest):          response = c.get(reverse('get-operation'), search)          self.assertEqual(response.status_code, 200)          res = json.loads(response.content) -        self.assertTrue(res['total'] == 1) +        self.assertTrue(res['recordsTotal'] == 1)          # no result for the brother          search = {'periods': recent_neo.pk}          response = c.get(reverse('get-operation'), search)          self.assertEqual(response.status_code, 200) -        self.assertEqual(json.loads(response.content)['total'], 0) +        self.assertEqual(json.loads(response.content)['recordsTotal'], 0)          # one result for the father          search = {'periods': neo.pk}          response = c.get(reverse('get-operation'), search)          self.assertEqual(response.status_code, 200) -        self.assertEqual(json.loads(response.content)['total'], 1) +        self.assertEqual(json.loads(response.content)['recordsTotal'], 1)      def test_town_search(self):          c = Client() @@ -1351,19 +1351,19 @@ class OperationSearchTest(TestCase, OperationInitTest):          search = {'towns': base_town.pk}          response = c.get(reverse('get-operation'), search)          self.assertEqual(response.status_code, 200) -        self.assertEqual(json.loads(response.content)['total'], 1) +        self.assertEqual(json.loads(response.content)['recordsTotal'], 1)          # parent search          search = {'towns': parent_town.pk}          response = c.get(reverse('get-operation'), search)          self.assertEqual(response.status_code, 200) -        self.assertEqual(json.loads(response.content)['total'], 1) +        self.assertEqual(json.loads(response.content)['recordsTotal'], 1)          # child search          search = {'towns': child_town.pk}          response = c.get(reverse('get-operation'), search)          self.assertEqual(response.status_code, 200) -        self.assertEqual(json.loads(response.content)['total'], 1) +        self.assertEqual(json.loads(response.content)['recordsTotal'], 1)      def testOwnSearch(self):          c = Client() @@ -1373,10 +1373,10 @@ class OperationSearchTest(TestCase, OperationInitTest):          c.login(username=self.alt_username, password=self.alt_password)          response = c.get(reverse('get-operation'), {'year': '2010'})          # only one "own" operation available -        self.assertTrue(json.loads(response.content)['total'] == 1) +        self.assertTrue(json.loads(response.content)['recordsTotal'] == 1)          response = c.get(reverse('get-operation'),                           {'operator': self.orgas[0].pk}) -        self.assertTrue(json.loads(response.content)['total'] == 1) +        self.assertTrue(json.loads(response.content)['recordsTotal'] == 1)  class DashboardTest(TestCase, OperationInitTest): @@ -1426,9 +1426,9 @@ class RegisterTest(TestCase, OperationInitTest):          self.assertTrue(not json.loads(response.content))          c.login(username=self.username, password=self.password)          response = c.get(reverse('get-administrativeact'), {'year': '2014'}) -        self.assertTrue(json.loads(response.content)['total'] == 1) +        self.assertTrue(json.loads(response.content)['recordsTotal'] == 1)          response = c.get(reverse('get-administrativeact'), {'indexed': '2'}) -        self.assertTrue(json.loads(response.content)['total'] == 1) +        self.assertTrue(json.loads(response.content)['recordsTotal'] == 1)      def test_document_generation(self):          tpl = open( | 
