Add custom serializer char/bool fields to accept null and coerce to appropriate type. Update validation for unique constraints so that error messages remain the same as before. Update key used in error response for non-field errors. Should address #791, #794, #809, #812 and #816.

awx/main/tests/old/organizations.py

@@ -262,7 +262,9 @@ class OrganizationsTest(BaseTest):
         data1 = self.post(self.collection(), new_org, expect=201, auth=self.get_super_credentials())
 
         # duplicate post results in 400
-        self.post(self.collection(), new_org, expect=400, auth=self.get_super_credentials())
+        response = self.post(self.collection(), new_org, expect=400, auth=self.get_super_credentials())
+        self.assertTrue('name' in response, response)
+        self.assertTrue('Name' in response['name'][0], response)
 
         # look at what we got back from the post, make sure we added an org
         last_org = Organization.objects.order_by('-pk')[0]

awx/main/tests/old/projects.py

@@ -231,12 +231,19 @@ class ProjectsTest(BaseTransactionTest):
             'description': 'Does amazing things',
             'local_path': os.path.basename(project_dir),
             'scm_type': None,
+            'scm_update_on_launch': '',
+            'scm_delete_on_update': None,
+            'scm_clean': False,
         }
         # Adding a project with scm_type=None should work, but scm_type will be
-        # changed to an empty string.
+        # changed to an empty string.  Other boolean fields should accept null
+        # or an empty string for False, but save the value as a boolean.
         response = self.post(projects, project_data, expect=201,
                              auth=self.get_super_credentials())
         self.assertEqual(response['scm_type'], u'')
+        self.assertEqual(response['scm_update_on_launch'], False)
+        self.assertEqual(response['scm_delete_on_update'], False)
+        self.assertEqual(response['scm_clean'], False)
 
         # can edit project using same local path.
         project_detail = reverse('api:project_detail', args=(response['id'],))
@@ -494,7 +501,9 @@ class ProjectsTest(BaseTransactionTest):
             ssh_key_data = TEST_SSH_KEY_DATA_LOCKED,
             ssh_key_unlock = TEST_SSH_KEY_DATA_UNLOCK,
             ssh_password = 'narf',
-            sudo_password = 'troz'
+            sudo_password = 'troz',
+            security_token = '',
+            vault_password = None,
         )
 
         # can add credentials to a user (if user or org admin or super user)
@@ -561,13 +570,17 @@ class ProjectsTest(BaseTransactionTest):
         # Repeating the same POST should violate a unique constraint.
         with self.current_user(self.super_django_user):
             data = dict(name='xyz', user=self.super_django_user.pk)
-            self.post(url, data, expect=400)
+            response = self.post(url, data, expect=400)
+            self.assertTrue('__all__' in response, response)
+            self.assertTrue('already exists' in response['__all__'][0], response)
 
-        # Test with null where we expect a string value.
+        # Test with null where we expect a string value.  Value will be coerced
+        # to an empty string.
         with self.current_user(self.super_django_user):
             data = dict(name='zyx', user=self.super_django_user.pk, kind='ssh',
                         become_username=None)
-            self.post(url, data, expect=400)
+            response = self.post(url, data, expect=201)
+            self.assertEqual(response['become_username'], '')
 
         # Test with encrypted ssh key and no unlock password.
         with self.current_user(self.super_django_user):
@@ -698,14 +711,15 @@ class ProjectsTest(BaseTransactionTest):
             # user=user.pk, # no need to specify, this will be automatically filled in
             inventory=inventory.pk,
             project=project.pk,
-            permission_type=PERM_INVENTORY_DEPLOY
+            permission_type=PERM_INVENTORY_DEPLOY,
+            run_ad_hoc_commands=None,
         )
         team_permission = dict(
             name='team can deploy a certain project to a certain inventory',
             # team=team.pk, # no need to specify, this will be automatically filled in
             inventory=inventory.pk,
             project=project.pk,
-            permission_type=PERM_INVENTORY_DEPLOY
+            permission_type=PERM_INVENTORY_DEPLOY,
         )
 
         url = reverse('api:user_permissions_list', args=(user.pk,))

awx/main/tests/old/users.py

@@ -207,6 +207,8 @@ class UsersTest(BaseTest):
         self.post(url, expect=403, data=new_super_user, auth=self.get_other_credentials())
         self.post(url, expect=403, data=new_super_user, auth=self.get_normal_credentials())
         self.post(url, expect=201, data=new_super_user, auth=self.get_super_credentials())
+        new_super_user2 = dict(username='nommy2', password='cookie', is_superuser=None)
+        self.post(url, expect=201, data=new_super_user2, auth=self.get_super_credentials())
 
     def test_auth_token_login(self):
         auth_token_url = reverse('api:auth_token_view')