diff --git a/ckanext/odsh/tests/test_harvest.py b/ckanext/odsh/tests/test_harvest.py index 30798c640ba8228294b76954c971b5816dcb4b80..5b6311a896c645aa0d6b58c64a51a8d66373965f 100644 --- a/ckanext/odsh/tests/test_harvest.py +++ b/ckanext/odsh/tests/test_harvest.py @@ -50,6 +50,7 @@ class TestHarvest: return self.app def _load_rdf_catalog(self): - with open('ckanext/odsh/tests/rdf_catalog.xml', 'r') as rdffile: + # with open('ckanext/odsh/tests/rdf_catalog.xml', 'r') as rdffile: + with open('ckanext/odsh/tests/rdf_catalog_empty.xml', 'r') as rdffile: data = rdffile.read() return data diff --git a/ckanext/odsh/tests/test_selenium.py b/ckanext/odsh/tests/test_selenium.py index 189cfc0144a2d861e67b19763e96be3d1cae0def..84046eda5cc6f37ba826af20cbad643310ec4762 100644 --- a/ckanext/odsh/tests/test_selenium.py +++ b/ckanext/odsh/tests/test_selenium.py @@ -18,21 +18,6 @@ class TestSelenium: TestSelenium.app = SeleniumCkanApp() # TestSelenium.app.login() - def notest_edit_paths(self): - paths = ['/organization/edit/' + test_org, - '/dataset/edit/testtesttest', - '/dataset/testtesttest/resource_edit/afaec407-d033-439d-a699-fe9279b20e6b', - '/dataset/new_resource/testtesttest', - '/dataset/new?group=', - '/harvest', - '/harvest/test2', - '/harvest/admin/test2' - ] - for path in paths: - TestSelenium.app.got_to_url(path) - cont = TestSelenium.app.get_slave_flag() - assert cont == u'0' - def test_login(self): TestSelenium.app.login() assert '/dataset' in TestSelenium.app.currentUrl() @@ -64,3 +49,19 @@ class TestSelenium: TestSelenium.app.findElementById('form-submit-button').click() assert 'dataset/'+title in TestSelenium.app.currentUrl() + + @depends(after=test_create_dataset) + def test_edit_paths(self): + paths = ['/organization/edit/' + test_org, + '/dataset/edit/testtesttest', + '/dataset/testtesttest/resource_edit/afaec407-d033-439d-a699-fe9279b20e6b', + '/dataset/new_resource/testtesttest', + '/dataset/new?group=', + '/harvest', + '/harvest/test2', + '/harvest/admin/test2' + ] + for path in paths: + TestSelenium.app.got_to_url(path) + cont = TestSelenium.app.get_slave_flag() + assert cont == u'0'