Merge branch 'release_3.3.0' into filterama

awx/main/tests/functional/api/test_generic.py

@@ -107,3 +107,13 @@ def test_filterable_fields(options, instance, admin_user):
     assert filterable_info['filterable'] is True
 
     assert not non_filterable_info['filterable']
+
+
+@pytest.mark.django_db
+def test_handle_content_type(post, admin):
+    ''' Tower should return 415 when wrong content type is in HTTP requests '''
+    post(reverse('api:project_list'),
+         {'name': 't', 'organization': None},
+         admin,
+         content_type='text/html',
+         expect=415)