Skip to content

Commit

Permalink
fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Mirek Simek committed Oct 11, 2020
1 parent 8b7d277 commit d3f292b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
1 change: 1 addition & 0 deletions oarepo_ui/facets.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def get_translated_facet(facet):


def translate_facets(facets, label=None, value=None, translator=None, permissions=None, possible_values=None):
facets = {**facets}
possible_values = possible_values or {}
for facet_key, facet_val in list(facets.items()):
facets[facet_key] = translate_facet(
Expand Down
12 changes: 7 additions & 5 deletions tests/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
},
}
}
FILTERS = {
'category': terms_filter('category')
}

def make_filters():
return {
'category': terms_filter('category')
}


def permission_factory(index_name, **kwargs):
Expand All @@ -40,15 +42,15 @@ def can(self):
label='my.own.facet.{facet_key}',
value='my.own.facet.{facet_key}.{value_key}',
permissions=permission_factory),
'filters': translate_filters(FILTERS, label='my.own.filter.{filter_key}')
'filters': translate_filters(make_filters(), label='my.own.filter.{filter_key}')
},
'translate-facets-filters-translator': {
'aggs': translate_facets(FACETS,
label='my.own.facet.{facet_key}',
value='my.own.facet.{facet_key}.{value_key}',
translator=lambda key, **kwargs: f'test-{key}',
permissions=permission_factory),
'filters': translate_filters(FILTERS, label='my.own.filter.{filter_key}',
'filters': translate_filters(make_filters(), label='my.own.filter.{filter_key}',
translator=lambda key, **kwargs: f'test-{key}')
},
'default-facets': {
Expand Down
12 changes: 6 additions & 6 deletions tests/test_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def test_views(app, client):
'translate-facets-filters-translator': {'endpoints': {},
'facets': [{'code': 'category',
'facet': {
'label': 'my.own.facet.category'}}],
'label': 'test-my.own.facet.category'}}],
'filters': [{'code': 'category',
'filter': {
'label': 'my.own.filter.category'}}]},
'label': 'test-my.own.filter.category'}}]},
'translate-filter': {'endpoints': {},
'facets': [],
'filters': [{'code': 'category',
Expand Down Expand Up @@ -98,10 +98,10 @@ def test_views(app, client):
'translate-facets-filters-translator': {'endpoints': {},
'facets': [{'code': 'category',
'facet': {
'label': 'můj.vlastní.facet.kategorie'}}],
'label': 'test-my.own.facet.category'}}],
'filters': [{'code': 'category',
'filter': {
'label': 'můj.vlastní.filter.kategorie'}}]},
'label': 'test-my.own.filter.category'}}]},
'translate-filter': {'endpoints': {},
'facets': [],
'filters': [{'code': 'category',
Expand Down Expand Up @@ -165,9 +165,9 @@ def test_perms(app, client):
'filter': {'label': 'my.own.filter.category'}}]},
'translate-facets-filters-translator': {'endpoints': {},
'facets': [{'code': 'category',
'facet': {'label': 'my.own.facet.category'}}],
'facet': {'label': 'test-my.own.facet.category'}}],
'filters': [{'code': 'category',
'filter': {'label': 'my.own.filter.category'}}]},
'filter': {'label': 'test-my.own.filter.category'}}]},
'translate-filter': {'endpoints': {},
'facets': [],
'filters': [{'code': 'category',
Expand Down

0 comments on commit d3f292b

Please sign in to comment.