Adapt functional tests to change in auth handling

Starting from CKAN 2.11 test client calls are authenticated via
`headers={"Authorization": token}` rather than
`environ_overrides={"Authorization": token}`. Created some helper
functions to handle different CKAN versions from a single place. Also
there is a new form in the page so index-based selectors needed to be
updated.

ckanext/scheming/tests/test_form.py

@@ -22,34 +22,77 @@ def sysadmin_env():
 
 
 def _get_package_new_page(app, env, type_='test-schema'):
-    return app.get(url="/{0}/new".format(type_), extra_environ=env)
+    if ckantoolkit.check_ckan_version(min_version="2.10.0"):
+        return app.get(url="/{0}/new".format(type_), headers=env)
+    else:
+        return app.get(url="/{0}/new".format(type_), extra_environ=env)
+
 
 def _get_package_update_page(app, id, env):
-    return app.get(
-        url="/test-schema/edit/{}".format(id), extra_environ=env
-    )
+
+    if ckantoolkit.check_ckan_version(min_version="2.10.0"):
+        return app.get(url="/test-schema/edit/{}".format(id), headers=env)
+    else:
+        return app.get(url="/test-schema/edit/{}".format(id), extra_environ=env)
 
 
 def _get_resource_new_page(app, id, env):
     url = '/dataset/{}/resource/new'.format(id)
-    return app.get(
-        url, extra_environ=env
-    )
+
+    if ckantoolkit.check_ckan_version(min_version="2.10.0"):
+        return app.get(url, headers=env)
+    else:
+        return app.get(url, extra_environ=env)
 
 
 def _get_resource_update_page(app, id, resource_id, env):
     url = '/dataset/{}/resource/{}/edit'.format(id, resource_id)
-    return app.get(
-        url, extra_environ=env,
-    )
+
+    if ckantoolkit.check_ckan_version(min_version="2.10.0"):
+        return app.get(url, headers=env)
+    else:
+        return app.get(url, extra_environ=env)
 
 
 def _get_organization_new_page(app, env, type_="organization"):
-    return app.get(url="/{0}/new".format(type_), extra_environ=env)
+
+    if ckantoolkit.check_ckan_version(min_version="2.10.0"):
+        return app.get(url="/{0}/new".format(type_), headers=env)
+    else:
+        return app.get(url="/{0}/new".format(type_), extra_environ=env)
 
 
 def _get_group_new_page(app, env, type_="group"):
-    return app.get(url="/{0}/new".format(type_), extra_environ=env)
+
+    if ckantoolkit.check_ckan_version(min_version="2.10.0"):
+        return app.get(url="/{0}/new".format(type_), headers=env)
+    else:
+        return app.get(url="/{0}/new".format(type_), extra_environ=env)
+
+
+def _get_organization_form(html):
+    # FIXME: add an id to this form
+    if ckantoolkit.check_ckan_version(min_version="2.11.0a0"):
+        form = BeautifulSoup(html).select("form")[2]
+    else:
+        form = BeautifulSoup(html).select("form")[1]
+    return form
+
+
+def _get_group_form(html):
+    return _get_organization_form(html)
+
+
+def _post_data(app, url, data, env):
+    try:
+        if ckantoolkit.check_ckan_version(min_version="2.11.0a0"):
+            app.post(url, headers=env, data=data, follow_redirects=False)
+        else:
+            app.post(
+                url, environ_overrides=env, data=data, follow_redirects=False
+            )
+    except TypeError:
+        app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
 
 
 @pytest.mark.usefixtures("clean_db")
@@ -69,12 +112,8 @@ def test_dataset_form_slug_says_dataset(self, app, sysadmin_env):
     def test_resource_form_includes_custom_fields(self, app, sysadmin_env):
         dataset = Dataset(type="test-schema", name="resource-includes-custom")
 
-        url = '/dataset/{}/resource/new'.format(dataset["id"])
+        response = _get_resource_new_page(app, dataset["id"], sysadmin_env)
 
-        response = app.get(
-            url,
-            extra_environ=sysadmin_env,
-        )
         form = BeautifulSoup(response.body).select_one("#resource-edit")
         assert form.select("input[name=camels_in_photo]")
 
@@ -84,18 +123,19 @@ def test_dataset_form_includes_licenses(self, app, sysadmin_env):
         `DefaultDatasetForm::setup_template_variables` in order to change
         it.
         """
-        response = app.get(url="/dataset/new", extra_environ=sysadmin_env)
+        response = _get_package_new_page(app, sysadmin_env, type_="dataset")
         page = BeautifulSoup(response.body)
         licenses = page.select('#field-license_id option')
         assert licenses
 
+
 @pytest.mark.usefixtures("clean_db")
 class TestOrganizationFormNew(object):
     def test_organization_form_includes_custom_field(self, app, sysadmin_env):
 
         response = _get_organization_new_page(app, sysadmin_env)
-        # FIXME: add an id to this form
-        form = BeautifulSoup(response.body).select("form")[1]
+
+        form = _get_organization_form(response.body)
 
         # FIXME: generate the form for orgs (this is currently missing)
         assert form.select("input[name=department_id]")
@@ -114,8 +154,7 @@ class TestGroupFormNew(object):
     def test_group_form_includes_custom_field(self, app, sysadmin_env):
 
         response = _get_group_new_page(app, sysadmin_env)
-        # FIXME: add an id to this form
-        form = BeautifulSoup(response.body).select("form")[1]
+        form = _get_organization_form(response.body)
 
         assert form.select("input[name=bookface]")
 
@@ -132,7 +171,9 @@ def test_group_form_slug_says_group(self, app, sysadmin_env):
 class TestCustomGroupFormNew(object):
     def test_group_form_includes_custom_field(self, app, sysadmin_env):
         response = _get_group_new_page(app, sysadmin_env, "theme")
-        form = BeautifulSoup(response.body).select("form")[1]
+
+        form = _get_group_form(response.body)
+
         assert form.select("input[name=status]")
 
     def test_group_form_slug_uses_custom_type(self, app, sysadmin_env):
@@ -148,7 +189,8 @@ def test_org_form_includes_custom_field(self, app, sysadmin_env):
         response = _get_organization_new_page(
             app, sysadmin_env, "publisher"
         )
-        form = BeautifulSoup(response.body).select("form")[1]
+
+        form = _get_organization_form(response.body)
         assert form.select("input[name=address]")
 
     def test_org_form_slug_uses_custom_type(self, app, sysadmin_env):
@@ -163,7 +205,7 @@ def test_org_form_slug_uses_custom_type(self, app, sysadmin_env):
 class TestJSONDatasetForm(object):
     def test_dataset_form_includes_json_fields(self, app, sysadmin_env):
         response = _get_package_new_page(app, sysadmin_env)
-        form = BeautifulSoup(response.body).select("form")[1]
+        form = BeautifulSoup(response.body).select("#dataset-edit")[0]
         assert form.select("textarea[name=a_json_field]")
 
     def test_dataset_form_create(self, app, sysadmin_env):
@@ -175,10 +217,8 @@ def test_dataset_form_create(self, app, sysadmin_env):
         data["a_json_field"] = json_value
 
         url = '/test-schema/new'
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
 
         dataset = call_action("package_show", id="json_dataset_1")
         assert dataset["a_json_field"] == value
@@ -205,10 +245,8 @@ def test_dataset_form_update(self, app, sysadmin_env):
         }
 
         url = '/dataset/edit/' + dataset["id"]
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
 
         dataset = call_action("package_show", id=dataset["id"])
 
@@ -245,10 +283,9 @@ def test_resource_form_create(self, app, sysadmin_env):
             "a_resource_json_field": json_value,
             "name": dataset["name"],
         }
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
+
         dataset = call_action("package_show", id=dataset["id"])
 
         assert dataset["resources"][0]["a_resource_json_field"] == value
@@ -293,10 +330,8 @@ def test_resource_form_update(self, app, sysadmin_env):
             "a_resource_json_field": json_value,
             "name": dataset["name"],
         }
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
 
         dataset = call_action("package_show", id=dataset["id"])
 
@@ -307,7 +342,7 @@ def test_resource_form_update(self, app, sysadmin_env):
 class TestSubfieldDatasetForm(object):
     def test_dataset_form_includes_subfields(self, app, sysadmin_env):
         response = _get_package_new_page(app, sysadmin_env, 'test-subfields')
-        form = BeautifulSoup(response.body).select("form")[1]
+        form = BeautifulSoup(response.body).select("#dataset-edit")[0]
         assert form.select("fieldset[name=scheming-repeating-subfields]")
 
     def test_dataset_form_create(self, app, sysadmin_env):
@@ -318,10 +353,8 @@ def test_dataset_form_create(self, app, sysadmin_env):
         data["contact_address-0-address"] = 'anyplace'
 
         url = '/test-subfields/new'
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
 
         dataset = call_action("package_show", id="subfield_dataset_1")
         assert dataset["citation"] == [{'originator': ['mei', 'ahmed']}]
@@ -348,10 +381,8 @@ def test_dataset_form_update(self, app, sysadmin_env):
         data["name"] = dataset["name"]
 
         url = '/test-subfields/edit/' + dataset["id"]
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
 
         dataset = call_action("package_show", id=dataset["id"])
 
@@ -382,10 +413,9 @@ def test_resource_form_create(self, app, sysadmin_env):
 
         data = {"id": "", "save": ""}
         data["schedule-0-impact"] = "P"
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+
+        _post_data(app, url, data, sysadmin_env)
+
         dataset = call_action("package_show", id=dataset["id"])
 
         assert dataset["resources"][0]["schedule"] == [{"impact": "P"}]
@@ -431,10 +461,7 @@ def test_resource_form_update(self, app, sysadmin_env):
         data["schedule-1-frequency"] = '1m'
         data["schedule-1-impact"] = 'P'
 
-        try:
-            app.post(url, environ_overrides=sysadmin_env, data=data, follow_redirects=False)
-        except TypeError:
-            app.post(url.encode('ascii'), params=data, extra_environ=sysadmin_env)
+        _post_data(app, url, data, sysadmin_env)
 
         dataset = call_action("package_show", id=dataset["id"])