diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py index 5c341d7d6..70854c785 100644 --- a/wagtail/wagtailsearch/tests/test_queries.py +++ b/wagtail/wagtailsearch/tests/test_queries.py @@ -102,45 +102,6 @@ class TestQueryPopularity(TestCase): self.assertEqual(popular_queries[1], models.Query.get("popular query")) self.assertEqual(popular_queries[2], models.Query.get("little popular query")) - @unittest.expectedFailure # Time based popularity isn't implemented yet - def test_query_popularity_over_time(self): - today = timezone.now().date() - two_days_ago = today - datetime.timedelta(days=2) - a_week_ago = today - datetime.timedelta(days=7) - a_month_ago = today - datetime.timedelta(days=30) - - # Add 10 hits to a query that was very popular query a month ago - for i in range(10): - models.Query.get("old popular query").add_hit(date=a_month_ago) - - # Add 5 hits to a query that is was popular 2 days ago - for i in range(5): - models.Query.get("new popular query").add_hit(date=two_days_ago) - - # Get most popular queries - popular_queries = models.Query.get_most_popular() - - # Old popular query should be most popular - self.assertEqual(popular_queries.count(), 2) - self.assertEqual(popular_queries[0], models.Query.get("old popular query")) - self.assertEqual(popular_queries[1], models.Query.get("new popular query")) - - # Get most popular queries for past week - past_week_popular_queries = models.Query.get_most_popular(date_since=a_week_ago) - - # Only new popular query should be in this list - self.assertEqual(past_week_popular_queries.count(), 1) - self.assertEqual(past_week_popular_queries[0], models.Query.get("new popular query")) - - # Old popular query gets a couple more hits! - for i in range(2): - models.Query.get("old popular query").add_hit() - - # Old popular query should now be in the most popular queries - self.assertEqual(past_week_popular_queries.count(), 2) - self.assertEqual(past_week_popular_queries[0], models.Query.get("new popular query")) - self.assertEqual(past_week_popular_queries[1], models.Query.get("old popular query")) - class TestGarbageCollectCommand(TestCase): def test_garbage_collect_command(self):