@@ -315,56 +315,53 @@ def create_pm(users:, group: nil)
315
315
TopicAllowedUser . create! ( user_id : u2 . id , topic_id : private_topic . id )
316
316
317
317
# private only
318
- results = Search . execute ( 'cheese' ,
319
- type_filter : 'all_topics' ,
318
+ results = Search . execute ( 'in:all cheese' ,
320
319
guardian : Guardian . new ( u1 ) )
321
320
expect ( results . posts . length ) . to eq ( 1 )
322
321
323
322
# public only
324
- results = Search . execute ( 'eggs' ,
325
- type_filter : 'all_topics' ,
323
+ results = Search . execute ( 'in:all eggs' ,
326
324
guardian : Guardian . new ( u1 ) )
327
325
expect ( results . posts . length ) . to eq ( 1 )
328
326
329
327
# both
330
- results = Search . execute ( 'spam' ,
331
- type_filter : 'all_topics' ,
328
+ results = Search . execute ( 'in:all spam' ,
332
329
guardian : Guardian . new ( u1 ) )
333
330
expect ( results . posts . length ) . to eq ( 2 )
334
331
332
+ # for anon
333
+ results = Search . execute ( 'in:all spam' ,
334
+ guardian : Guardian . new )
335
+ expect ( results . posts . length ) . to eq ( 1 )
336
+
335
337
# nonparticipatory user
336
- results = Search . execute ( 'cheese' ,
337
- type_filter : 'all_topics' ,
338
+ results = Search . execute ( 'in:all cheese' ,
338
339
guardian : Guardian . new ( u3 ) )
339
340
expect ( results . posts . length ) . to eq ( 0 )
340
341
341
- results = Search . execute ( 'eggs' ,
342
- type_filter : 'all_topics' ,
342
+ results = Search . execute ( 'in:all eggs' ,
343
343
guardian : Guardian . new ( u3 ) )
344
344
expect ( results . posts . length ) . to eq ( 1 )
345
345
346
- results = Search . execute ( 'spam' ,
347
- type_filter : 'all_topics' ,
346
+ results = Search . execute ( 'in:all spam' ,
348
347
guardian : Guardian . new ( u3 ) )
349
348
expect ( results . posts . length ) . to eq ( 1 )
350
349
351
350
# Admin doesn't see private topic
352
- results = Search . execute ( 'spam' ,
353
- type_filter : 'all_topics' ,
351
+ results = Search . execute ( 'in:all spam' ,
354
352
guardian : Guardian . new ( u4 ) )
355
353
expect ( results . posts . length ) . to eq ( 1 )
356
354
357
355
# same keyword for different users
358
- results = Search . execute ( 'ham' ,
359
- type_filter : 'all_topics' ,
356
+ results = Search . execute ( 'in:all ham' ,
360
357
guardian : Guardian . new ( u1 ) )
361
358
expect ( results . posts . length ) . to eq ( 2 )
362
- results = Search . execute ( 'ham' ,
363
- type_filter : 'all_topics ',
359
+
360
+ results = Search . execute ( 'in:all ham ',
364
361
guardian : Guardian . new ( u2 ) )
365
362
expect ( results . posts . length ) . to eq ( 2 )
366
- results = Search . execute ( 'ham' ,
367
- type_filter : 'all_topics ',
363
+
364
+ results = Search . execute ( 'in:all ham ',
368
365
guardian : Guardian . new ( u3 ) )
369
366
expect ( results . posts . length ) . to eq ( 1 )
370
367
end
0 commit comments