CKAN-Extensions
/
ckanext-privatedatasets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32 from conwetlab/develop 

Fix Selenium Tests
This commit is contained in:
Aitor Magán García 2015-06-30 15:58:57 +02:00
parent 10ab4e0f05 98923e431b
commit 172bfa221f
6 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/setup_and_test.sh
View File

@ -13,7 +13,7 @@ CACHE_DIR=~/.cache
echo "Downloading CKAN..."
git clone https://github.com/ckan/ckan
cd ckan
git checkout release-v2.2.2
git checkout release-v2.3
cd $WD

2
ckanext/privatedatasets/actions.py
View File

@ -178,7 +178,7 @@ def acquisitions_list(context, data_dict):
# Get the datasets
for dataset in query:
try:
dataset_show_func = 'dataset_show'
dataset_show_func = 'package_show'
func_data_dict = {'id': dataset.package_id}
internal_context = context.copy()

4
ckanext/privatedatasets/plugin.py
View File

@ -218,8 +218,10 @@ class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm):
'validate': False,
'use_cache': False},
{'id': package_id})
# Prevent acquired datasets jumping to the first position
new_pkg_dict['metadata_modified'] = new_pkg_dict.get('revision_timestamp', '')
revision = tk.get_action('revision_show')({'ignore_auth': True}, {'id': new_pkg_dict['revision_id']})
new_pkg_dict['metadata_modified'] = revision.get('timestamp', '')
self.indexer.update_dict(new_pkg_dict)
return pkg_dict

15
ckanext/privatedatasets/tests/test_plugin.py
View File

@ -292,11 +292,20 @@ class PluginTest(unittest.TestCase):
package_id = 'package_id'
# Configure mocks
default_dict = {'a': '0', 'b': 1, 'm': True, 'revision_timestamp': '2000'}
revision = {'timestamp': '7888'}
default_dict = {'a': '0', 'b': 1, 'm': True, 'revision_id': 'revision_id_uuidv4'}
expected_dict = default_dict.copy()
expected_dict['metadata_modified'] = default_dict['revision_timestamp']
expected_dict['metadata_modified'] = revision['timestamp']
package_show = MagicMock(return_value=default_dict.copy())
plugin.tk.get_action = MagicMock(return_value=package_show)
revision_show = MagicMock(return_value=revision.copy())
def _get_action(action):
if action == 'package_show':
return package_show
elif action == 'revision_show':
return revision_show
plugin.tk.get_action = MagicMock(side_effect=_get_action)
# Each time 'AllowedUser' is called, we must get a new instance
# and this is the way to get this behaviour

39
ckanext/privatedatasets/tests/test_selenium.py
View File

@ -30,7 +30,6 @@ import os
import unittest
import re
import requests
import time
def get_dataset_url(dataset_name):
@ -81,7 +80,8 @@ class TestSelenium(unittest.TestCase):
self.assertFalse(self.driver.find_element_by_id(field).is_enabled())
def logout(self):
self.driver.find_element_by_css_selector('i.icon-signout').click()
self.driver.delete_all_cookies()
self.driver.get(self.base_url)
def register(self, username, fullname, mail, password):
driver = self.driver
@ -180,9 +180,6 @@ class TestSelenium(unittest.TestCase):
driver.find_element_by_id('s2id_autogen1').send_keys(resource_format)
driver.find_element_by_css_selector('button.btn.btn-primary').click()
# THIRD PAGE: Metadata
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):
driver = self.driver
driver.get('%sdataset/edit/%s' % (self.base_url, url))
@ -200,9 +197,10 @@ class TestSelenium(unittest.TestCase):
# Test that the allowed users lists is as expected (order is not important)
current_users = driver.find_element_by_css_selector('#s2id_field-allowed_users_str > ul.select2-choices').text.split('\n')
current_users = current_users[0:-1]
# ''.split('\n') ==> ['']
if len(current_users) == 1 and current_users[0] == '':
current_users = []
# if len(current_users) == 1 and current_users[0] == '':
# current_users = []
# Check the array
self.assertEquals(len(allowed_users), len(current_users))
for user in current_users:
@ -225,15 +223,13 @@ class TestSelenium(unittest.TestCase):
elif owner:
self.assertEqual('OWNER', driver.find_element_by_xpath(xpath).text)
# Access the dataset
driver.find_element_by_link_text(dataset).click()
# When a user cannot access a dataset, the link is no longer provided
else:
# If the dataset is not searchable, a link to it could not be found in the dataset search page
self.assertEquals(None, re.search(dataset_url, driver.page_source))
# Access the dataset
driver.get(self.base_url + 'dataset/' + dataset_url)
# Access the dataset
driver.get(self.base_url + 'dataset/' + dataset_url)
if not acquired and private and not in_org:
xpath = '//div[@id=\'content\']/div/div'
@ -308,14 +304,20 @@ class TestSelenium(unittest.TestCase):
self.login(user, user)
acquired = user in allowed_users
self.check_user_access(pkg_name, url, False, acquired, False, private, searchable, acquire_url)
# The user is logged out when they try to access a private dataset and they are not included
# in the list of allowed users.
if not acquired and private:
self.login(user, user)
self.check_acquired(pkg_name, url, acquired, private)
@parameterized.expand([
# (['a'] , 'http://upm.es', 'Allowed users: Name must be at least 2 characters long'),
# (['a a'], 'http://upm.es', 'Allowed users: Url must be purely lowercase alphanumeric (ascii) characters and these symbols: -_'),
(['upm', 'a'], 'http://upm.es', 'Allowed users: Name must be at least 2 characters long'),
(['upm', 'a a a'], 'http://upm.es', 'Allowed users: Url must be purely lowercase alphanumeric (ascii) characters and these symbols: -_'),
(['upm', 'a?-vz'], 'http://upm.es', 'Allowed users: Url must be purely lowercase alphanumeric (ascii) characters and these symbols: -_'),
(['upm', 'a'], 'http://upm.es', 'Allowed users: Must be at least 2 characters long'),
(['upm', 'a a a'], 'http://upm.es', 'Allowed users: Must be purely lowercase alphanumeric (ascii) characters and these symbols: -_'),
(['upm', 'a?-vz'], 'http://upm.es', 'Allowed users: Must be purely lowercase alphanumeric (ascii) characters and these symbols: -_'),
(['thisisaveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryveryverylongname'],
'http://upm.es', 'Allowed users: Name must be a maximum of 100 characters long'),
(['conwet'], 'ftp://google.es', 'Acquire URL: The URL "ftp://google.es" is not valid.'),
@ -390,7 +392,6 @@ class TestSelenium(unittest.TestCase):
([{'private': False, 'searchable': True, 'allowed_users': ['user1', 'user2']}], ['user3', 'user4']),
([{'private': True, 'searchable': False, 'allowed_users': ['user1', 'user2']}], ['user3', 'user4']),
([{'private': False, 'searchable': False, 'allowed_users': ['user1', 'user2']}], ['user3', 'user4']),
# Complex test
([{'private': True, 'searchable': False, 'allowed_users': ['user1', 'user2']},
{'private': True, 'searchable': True, 'allowed_users': ['user5', 'user6']},
@ -496,6 +497,12 @@ class TestSelenium(unittest.TestCase):
acquired = user in adquiring_users
in_org = user in orgs[0]['users']
self.check_user_access(pkg_name, url, False, acquired, in_org, private, searchable, acquire_url)
# The user is logged out when they try to access a private dataset and they are not included
# in the list of allowed users.
if not acquired and private and not in_org:
self.login(user, user)
self.check_acquired(pkg_name, url, acquired, private)
def test_bug_16(self):

2
dev-requirements.txt
View File

@ -1,2 +1,2 @@
nose_parameterized==0.3.3
selenium==2.44.0
selenium==2.46.0