adds additional unit tests to the menu items for user

opal/core/plugins.py

@@ -64,5 +64,5 @@ def get_javascripts(klass):
         return [j for j in klass.javascripts]
 
     @classmethod
-    def get_menu_items(self, user=None):
-        return [i for i in self.menuitems if i.for_user(user)]
+    def get_menu_items(cls, user=None):
+        return [i for i in cls.menuitems if i.for_user(user)]

opal/tests/test_core_application.py

@@ -65,7 +65,28 @@ def test_get_javascripts_updating_side_effects(self):
     def test_get_menu_items(self):
         self.assertEqual(
             application.OpalApplication.menuitems,
-            application.OpalApplication.get_menu_items())
+            application.OpalApplication.get_menu_items()
+        )
+
+    def test_get_menu_items_for_user(self):
+        class MenuItemIncluded(menus.MenuItem):
+            pass
+
+        class MenuItemNotIncluded(menus.MenuItem):
+            def for_user(self, user):
+                return False
+
+        menu_item_included = MenuItemIncluded()
+        menu_item_not_included = MenuItemNotIncluded()
+
+        self.app.menuitems = [
+                    menu_item_included, menu_item_not_included
+                ]
+
+        self.assertEqual(
+            [menu_item_included],
+            list(self.app.get_menu_items())
+        )
 
     def test_get_menu_items_includes_logout_for_authenticated_users(self):
         user = self.user

opal/tests/test_core_plugins.py

@@ -8,6 +8,7 @@
 
 from opal.core.test import OpalTestCase
 from opal.core import menus
+from opal.utils import AbstractBase
 
 from opal.core import plugins
 
@@ -18,7 +19,7 @@ class TestPlugin1(plugins.OpalPlugin):
             javascripts = ['js/test/notreal.js']
             stylesheets = ['css/test/notreal.css']
             head_extra = ['notareal_template.html']
-            menuitems = [ menus.MenuItem(display='test') ]
+            menuitems = [menus.MenuItem(display='test') ]
             angular_module_deps = ['js/test.angular.mod.js']
 
         class TestPlugin2(plugins.OpalPlugin):
@@ -74,3 +75,24 @@ def test_get_javascripts_side_effects(self):
         js_orig = copy.copy(js)
         js.append('icanhazcheezburgerify.js')
         self.assertEqual(js_orig, self.plugin1.get_javascripts())
+
+    def test_get_menu_items(self):
+        class MenuItemIncluded(menus.MenuItem):
+            pass
+
+        class MenuItemNotIncluded(menus.MenuItem):
+            def for_user(self, user):
+                return False
+
+        menu_item_included = MenuItemIncluded()
+        menu_item_not_included = MenuItemNotIncluded()
+
+        class TestPlugin(plugins.OpalPlugin, AbstractBase):
+                menuitems = [
+                    menu_item_included, menu_item_not_included
+                ]
+
+        self.assertEqual(
+            [menu_item_included],
+            list(TestPlugin.get_menu_items())
+        )