Merge branch 'dockerize_tests' into develop

ckanext/privatedatasets/tests/test_selenium.py

@@ -66,10 +66,15 @@ class TestSelenium(unittest.TestCase):
     def setUp(self):
         self.clearBBDD()
 
-        self.driver = webdriver.Firefox()
+        if 'WEB_DRIVER_URL' in os.environ and 'CKAN_SERVER_URL' in os.environ:
+            self.driver = webdriver.Remote(os.environ['WEB_DRIVER_URL'], webdriver.DesiredCapabilities.FIREFOX.copy())
+            self.base_url = os.environ['CKAN_SERVER_URL']
+        else:
+            self.driver = webdriver.Firefox()
+            self.base_url = 'http://127.0.0.1:5000/'
+
         self.driver.implicitly_wait(5)
         self.driver.set_window_size(1024, 768)
-        self.base_url = 'http://127.0.0.1:5000/'
 
     def tearDown(self):
         self.clearBBDD()
@@ -177,7 +182,7 @@ class TestSelenium(unittest.TestCase):
         driver.find_element_by_id('field-description').clear()
         driver.find_element_by_id('field-description').send_keys(resource_description)
         driver.find_element_by_id('s2id_autogen1').clear()
-        driver.find_element_by_id('s2id_autogen1').send_keys(resource_format)
+        driver.find_element_by_id('s2id_autogen1').send_keys(resource_format + '\n')
         driver.find_element_by_css_selector('button.btn.btn-primary').click()
 
     def modify_ds(self, url, name, description, tags, private, searchable, allowed_users, acquire_url):

setup.py

@@ -48,7 +48,7 @@ setup(
     ],
     tests_require=[
         'nose_parameterized==0.3.3',
-        'selenium==2.46.0'
+        'selenium==2.52.0'
     ],
     test_suite='nosetests',
     entry_points='''
@@ -56,4 +56,4 @@ setup(
         # Add plugins here, e.g.
         privatedatasets=ckanext.privatedatasets.plugin:PrivateDatasets
     ''',
-)
+)

test.ini

@@ -6,7 +6,7 @@ port = 5000
 [app:main]
 use = config:./ckan/test-core.ini
 
-ckan.legacy_templates = No
+ckan.legacy_templates = no
 ckan.plugins = privatedatasets
 ckan.privatedatasets.parser = ckanext.privatedatasets.parsers.fiware:FiWareNotificationParser
 ckan.privatedatasets.show_acquire_url_on_create = True