Merge branch 'canada-v2.9' into staging-v2.9

ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po

@@ -6165,6 +6165,14 @@ msgstr ""
 msgid "Search and view users."
 msgstr ""
 
+#: ckanext/canada/validators.py:382
+msgid "Invalid JSON for Schema"
+msgstr ""
+
+#: ckanext/canada/validators.py:385
+msgid "Schema URLs are not supported"
+msgstr ""
+
 #: ckanext/canada/templates/internal/package/read.html:6
 msgid "Your record will be published at:"
 msgstr ""
@@ -6180,7 +6188,3 @@ msgstr ""
 #: ckanext/canada/templates/internal/package/read.html:16
 msgid "Queued for publishing"
 msgstr ""
-
-#: ckanext/canada/validators.py:382
-msgid "Invalid JSON for Schema"
-msgstr ""

ckanext/canada/i18n/fr/LC_MESSAGES/ckanext-canada.po

@@ -3643,6 +3643,14 @@ msgstr "Rechercher et gérer les utilisateurs."
 msgid "Search and view users."
 msgstr "Rechercher et afficher les utilisateurs."
 
+#: ckanext/canada/validators.py:382
+msgid "Invalid JSON for Schema"
+msgstr "JSON non valide pour le schéma"
+
+#: ckanext/canada/validators.py:385
+msgid "Schema URLs are not supported"
+msgstr "Les adresses URL des schémas ne sont pas prises en charge"
+
 #: ckanext/canada/templates/internal/package/read.html:6
 msgid "Your record will be published at:"
 msgstr "Votre document sera publié à :"
@@ -3658,7 +3666,3 @@ msgstr "Approbation nécessaire"
 #: ckanext/canada/templates/internal/package/read.html:16
 msgid "Queued for publishing"
 msgstr "Mis en file d'attente à des fins de publication"
-
-#: ckanext/canada/validators.py:382
-msgid "Invalid JSON for Schema"
-msgstr "JSON non valide pour le schéma"

ckanext/canada/templates/internal/package/read.html

@@ -2,7 +2,7 @@
 
 {% block internal_actions %}
   <section class="resources module-content indent-large">
-    {% set portal_link = h.portal_url() ~ "/data/" ~ client_lang ~ "/" ~ pkg.name %}
+    {% set portal_link = h.portal_url() ~ "/data/" ~ client_lang ~ "/" ~ pkg.get('type', 'dataset') ~ "/" ~ pkg.name %}
     {% set sub_label = _("Your record will be published at:") %}
     {% set alert_class = "info" %}
     {% set show_portal_status_alert = true %}

ckanext/canada/tests/__init__.py

@@ -0,0 +1,17 @@
+from ckan.tests.helpers import reset_db
+from ckan.lib.search import clear_all
+from ckanext.validation.model import (
+    create_tables as validation_create_tables,
+    tables_exist as validation_tables_exist
+)
+
+class CanadaTestBase(object):
+    @classmethod
+    def setup_method(self, method):
+        """Method is called at class level before EACH test methods of the class are called.
+        Setup any state specific to the execution of the given class methods.
+        """
+        if not validation_tables_exist():
+            validation_create_tables()
+        reset_db()
+        clear_all()

ckanext/canada/tests/test_alerts.py

@@ -1,23 +1,21 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckan.plugins.toolkit import h
 from ckanapi import LocalCKAN
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckan.tests.factories import Sysadmin
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 
 @pytest.mark.usefixtures('with_request_context')
-class TestPackageAlerts(object):
+class TestPackageAlerts(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestPackageAlerts, self).setup_method(method)
 
         self.sysadmin = Sysadmin()
         self.extra_environ_tester = {'REMOTE_USER': self.sysadmin['name'].encode('ascii')}

ckanext/canada/tests/test_ati.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestAti(object):
+class TestAti(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestAti, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()
@@ -44,14 +42,13 @@ def test_blank(self):
         assert 'request_number' in err['key'][0]
 
 
-class TestAtiNil(object):
+class TestAtiNil(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestAtiNil, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_briefingt.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestBriefingT(object):
+class TestBriefingT(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestBriefingT, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_consultations.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestConsultations(object):
+class TestConsultations(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestConsultations, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_contracts.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestContracts(object):
+class TestContracts(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestContracts, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_contractsa.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestContractsA(object):
+class TestContractsA(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestContractsA, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_dac.py

@@ -1,23 +1,21 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 from ckanext.recombinant.helpers import recombinant_choice_fields
 
 
-class TestDAC(object):
+class TestDAC(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestDAC, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_experiment.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestExperiment(object):
+class TestExperiment(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestExperiment, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_grants.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestGrants(object):
+class TestGrants(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestGrants, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()

ckanext/canada/tests/test_hospitalityq.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
+from ckanext.canada.tests import CanadaTestBase
 from ckanapi import LocalCKAN, ValidationError
 
 import pytest
-from ckan.tests.helpers import reset_db
-from ckan.lib.search import clear_all
 from ckanext.canada.tests.factories import CanadaOrganization as Organization
 
 from ckanext.recombinant.tables import get_chromo
 
 
-class TestHospitalityQ(object):
+class TestHospitalityQ(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestHospitalityQ, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()
@@ -44,14 +42,13 @@ def test_blank(self):
         assert 'ref_number' in err['key'][0]
 
 
-class TestHospitalityQNil(object):
+class TestHospitalityQNil(CanadaTestBase):
     @classmethod
     def setup_method(self, method):
         """Method is called at class level before EACH test methods of the class are called.
         Setup any state specific to the execution of the given class methods.
         """
-        reset_db()
-        clear_all()
+        super(TestHospitalityQNil, self).setup_method(method)
 
         org = Organization()
         self.lc = LocalCKAN()