@@ -1644,30 +1644,25 @@ def test_list_publications(self):
16441644 result = self .client .get (reverse ("publication:list" ))
16451645 self .assertEqual (result .status_code , 200 )
16461646
1647- self .assertEqual (len (result .context ["last_articles" ]), 1 )
1648- self .assertEqual (len (result .context ["last_tutorials" ]), 4 )
1647+ self .assertEqual (len (result .context ["last_contents" ]), 5 )
16491648
16501649 # 2. Category page
16511650 result = self .client .get (reverse ("publication:category" , kwargs = {"slug" : category_1 .slug }))
16521651 self .assertEqual (result .status_code , 200 )
16531652
1654- self .assertEqual (len (result .context ["last_articles" ]), 0 )
1655- self .assertEqual (len (result .context ["last_tutorials" ]), 2 )
1653+ self .assertEqual (len (result .context ["last_contents" ]), 2 )
16561654
1657- pks = [x .pk for x in result .context ["last_tutorials " ]]
1655+ pks = [x .pk for x in result .context ["last_contents " ]]
16581656 self .assertIn (tuto_1 .pk , pks )
16591657 self .assertIn (tuto_2 .pk , pks )
16601658
16611659 result = self .client .get (reverse ("publication:category" , kwargs = {"slug" : category_2 .slug }))
16621660 self .assertEqual (result .status_code , 200 )
16631661
1664- self .assertEqual (len (result .context ["last_articles" ]), 1 )
1665- self .assertEqual (len (result .context ["last_tutorials" ]), 1 )
1662+ self .assertEqual (len (result .context ["last_contents" ]), 2 )
16661663
1667- pks = [x .pk for x in result .context ["last_tutorials " ]]
1664+ pks = [x .pk for x in result .context ["last_contents " ]]
16681665 self .assertIn (tuto_3 .pk , pks )
1669-
1670- pks = [x .pk for x in result .context ["last_articles" ]]
16711666 self .assertIn (article_1 .pk , pks )
16721667
16731668 # 3. Subcategory page
@@ -1677,10 +1672,9 @@ def test_list_publications(self):
16771672
16781673 self .assertEqual (result .status_code , 200 )
16791674
1680- self .assertEqual (len (result .context ["last_articles" ]), 0 )
1681- self .assertEqual (len (result .context ["last_tutorials" ]), 2 )
1675+ self .assertEqual (len (result .context ["last_contents" ]), 2 )
16821676
1683- pks = [x .pk for x in result .context ["last_tutorials " ]]
1677+ pks = [x .pk for x in result .context ["last_contents " ]]
16841678 self .assertIn (tuto_1 .pk , pks )
16851679 self .assertIn (tuto_2 .pk , pks )
16861680
@@ -1690,10 +1684,9 @@ def test_list_publications(self):
16901684
16911685 self .assertEqual (result .status_code , 200 )
16921686
1693- self .assertEqual (len (result .context ["last_articles" ]), 0 )
1694- self .assertEqual (len (result .context ["last_tutorials" ]), 2 )
1687+ self .assertEqual (len (result .context ["last_contents" ]), 2 )
16951688
1696- pks = [x .pk for x in result .context ["last_tutorials " ]]
1689+ pks = [x .pk for x in result .context ["last_contents " ]]
16971690 self .assertIn (tuto_1 .pk , pks )
16981691 self .assertIn (tuto_2 .pk , pks )
16991692
@@ -1703,10 +1696,9 @@ def test_list_publications(self):
17031696
17041697 self .assertEqual (result .status_code , 200 )
17051698
1706- self .assertEqual (len (result .context ["last_articles" ]), 0 )
1707- self .assertEqual (len (result .context ["last_tutorials" ]), 1 )
1699+ self .assertEqual (len (result .context ["last_contents" ]), 1 )
17081700
1709- pks = [x .pk for x in result .context ["last_tutorials " ]]
1701+ pks = [x .pk for x in result .context ["last_contents " ]]
17101702 self .assertIn (tuto_3 .pk , pks )
17111703
17121704 result = self .client .get (
@@ -1715,10 +1707,9 @@ def test_list_publications(self):
17151707
17161708 self .assertEqual (result .status_code , 200 )
17171709
1718- self .assertEqual (len (result .context ["last_articles" ]), 1 )
1719- self .assertEqual (len (result .context ["last_tutorials" ]), 0 )
1710+ self .assertEqual (len (result .context ["last_contents" ]), 1 )
17201711
1721- pks = [x .pk for x in result .context ["last_articles " ]]
1712+ pks = [x .pk for x in result .context ["last_contents " ]]
17221713 self .assertIn (article_1 .pk , pks )
17231714
17241715 # 4. Final page and filters
@@ -1739,20 +1730,6 @@ def test_list_publications(self):
17391730 self .assertIn (tuto_3 .pk , pks )
17401731 self .assertIn (article_1 .pk , pks )
17411732
1742- result = self .client .get (reverse ("publication:list" ) + f"?category={ category_2 .slug } " + "&type=article" )
1743- self .assertEqual (result .status_code , 200 )
1744-
1745- self .assertEqual (len (result .context ["filtered_contents" ]), 1 )
1746- pks = [x .pk for x in result .context ["filtered_contents" ]]
1747- self .assertIn (article_1 .pk , pks )
1748-
1749- result = self .client .get (reverse ("publication:list" ) + f"?category={ category_2 .slug } " + "&type=tutorial" )
1750- self .assertEqual (result .status_code , 200 )
1751-
1752- self .assertEqual (len (result .context ["filtered_contents" ]), 1 )
1753- pks = [x .pk for x in result .context ["filtered_contents" ]]
1754- self .assertIn (tuto_3 .pk , pks )
1755-
17561733 # filter by subcategory
17571734 result = self .client .get (reverse ("publication:list" ) + f"?subcategory={ subcategory_1 .slug } " )
17581735 self .assertEqual (result .status_code , 200 )
@@ -1770,17 +1747,6 @@ def test_list_publications(self):
17701747 pks = [x .pk for x in result .context ["filtered_contents" ]]
17711748 self .assertIn (tuto_3 .pk , pks )
17721749
1773- result = self .client .get (reverse ("publication:list" ) + f"?subcategory={ subcategory_3 .slug } " + "&type=article" )
1774- self .assertEqual (result .status_code , 200 )
1775- self .assertEqual (len (result .context ["filtered_contents" ]), 0 )
1776-
1777- result = self .client .get (reverse ("publication:list" ) + f"?subcategory={ subcategory_3 .slug } " + "&type=tutorial" )
1778- self .assertEqual (result .status_code , 200 )
1779-
1780- self .assertEqual (len (result .context ["filtered_contents" ]), 1 )
1781- pks = [x .pk for x in result .context ["filtered_contents" ]]
1782- self .assertIn (tuto_3 .pk , pks )
1783-
17841750 # filter by tag
17851751 result = self .client .get (reverse ("publication:list" ) + f"?tag={ tag_1 .slug } " + "&type=article" )
17861752 self .assertEqual (result .status_code , 200 )
@@ -1794,7 +1760,6 @@ def test_list_publications(self):
17941760 # not existing (sub)categories, types or tags with slug "xxx"
17951761 reverse ("publication:list" ) + "?category=xxx" ,
17961762 reverse ("publication:list" ) + "?subcategory=xxx" ,
1797- reverse ("publication:list" ) + "?type=xxx" ,
17981763 reverse ("publication:list" ) + "?tag=xxx" ,
17991764 reverse ("publication:category" , kwargs = {"slug" : "xxx" }),
18001765 reverse ("publication:subcategory" , kwargs = {"slug_category" : category_2 .slug , "slug" : "xxx" }),
0 commit comments