Skip to content

Commit c660a9d

Browse files
authored
init mongo indexes before each test (#2838)
* init mongo indexes before each test and fix failing tests * fix index filter
1 parent badf78b commit c660a9d

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

apps/concept_items/resource.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,8 @@ class ConceptItemsResource(Resource):
5252
],
5353
{"collation": {"locale": "en", "strength": 1}},
5454
),
55-
"group_id": ([("group_id", 1), ("language", 1)], {"unique": True}),
55+
"group_id": (
56+
[("group_id", 1), ("language", 1)],
57+
{"unique": True, "partialFilterExpression": {"group_id": {"$exists": True}}},
58+
),
5659
}

features/content_profile.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ Feature: Content Profile
691691
Scenario: Mark profile when used and prevent delete
692692
Given "content_types"
693693
"""
694-
[{"_id": "foo"}, {"_id": "bar"}]
694+
[{"_id": "foo", "label": "Foo"}, {"_id": "bar", "label": "Bar"}]
695695
"""
696696
When we get "content_types/foo"
697697
Then we get existing resource

features/content_rewrite.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -1771,8 +1771,8 @@ Feature: Rewrite content
17711771
And "ingest_providers"
17721772
"""
17731773
[
1774-
{ "_id": "1", "name": "agency", "source": "YYY"},
1775-
{ "_id": "2", "name": "agency", "source": "XXX"}
1774+
{ "_id": "1", "name": "agency1", "source": "YYY"},
1775+
{ "_id": "2", "name": "agency2", "source": "XXX"}
17761776
]
17771777
"""
17781778
And the "validators"

superdesk/tests/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ def setup(context=None, config=None, app_factory=get_app, reset=False):
372372
with app.app_context():
373373
clean_dbs(app, force=bool(config))
374374
app.data.elastic.init_index()
375+
app.init_indexes()
375376
cache.clean()
376377

377378

tests/content_filters/filter_condition_tests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ def setUp(self):
9898
)
9999
self.app.data.insert(
100100
"filter_conditions",
101-
[{"_id": 3, "field": "urgency", "operator": "in", "value": "3,4,5", "name": "test-2"}],
101+
[{"_id": 3, "field": "urgency", "operator": "in", "value": "3,4,5", "name": "test-3"}],
102102
)
103103
self.app.data.insert(
104104
"filter_conditions",
105-
[{"_id": 4, "field": "urgency", "operator": "nin", "value": "1,2,3", "name": "test-2"}],
105+
[{"_id": 4, "field": "urgency", "operator": "nin", "value": "1,2,3", "name": "test-4"}],
106106
)
107107
self.app.data.insert(
108108
"filter_conditions",
109-
[{"_id": 5, "field": "urgency", "operator": "in", "value": "2,5", "name": "test-2"}],
109+
[{"_id": 5, "field": "urgency", "operator": "in", "value": "2,5", "name": "test-5"}],
110110
)
111111
self.app.data.insert(
112112
"content_filters", [{"_id": 1, "content_filter": [{"expression": {"fc": [1]}}], "name": "soccer-only"}]

0 commit comments

Comments
 (0)