Merge pull request ManageIQ#7078 from himdel/settings_loader

Menu - drop SettingsLoader
d-m-u · May 29, 2020 · 4211196 · 4211196
2 parents 62f4ef8 + 5fad0b9
commit 4211196
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 83 deletions.
diff --git a/app/presenters/menu/manager.rb b/app/presenters/menu/manager.rb
@@ -75,7 +75,6 @@ def initialize
       load_default_items
       load_custom_items(Menu::YamlLoader)
       load_custom_items(Menu::CustomLoader)
-      load_custom_items(Menu::SettingsLoader)
     end
 
     def merge_sections(sections)

diff --git a/app/presenters/menu/settings_loader.rb b/app/presenters/menu/settings_loader.rb
diff --git a/config/settings.yml b/config/settings.yml
@@ -8,4 +8,3 @@
   :physical_infra_provider: https://manageiq.org/docs/reference/latest/doc-Managing_Providers/miq/#infrastructure_providers
 :ui:
   :custom_button_count: 3
-  :custom_menu:
diff --git a/spec/presenters/menu/menu_manager_spec.rb b/spec/presenters/menu/menu_manager_spec.rb
@@ -38,15 +38,4 @@
       end
     end
   end
-
-  context "menu" do
-    it "knows about custom items from settings" do
-      ::Settings.ui.custom_menu = settings_custom_items
-      count = 0
-      Menu::Manager.menu.each do |item|
-        count += 1 if item.kind_of?(Menu::Item) && item.name =~ /^Custom Item/
-      end
-      expect(count).to eq(2)
-    end
-  end
 end
diff --git a/spec/presenters/menu/settings_loader_spec.rb b/spec/presenters/menu/settings_loader_spec.rb
diff --git a/spec/support/menu_helper.rb b/spec/support/menu_helper.rb
@@ -36,27 +36,6 @@ def section_file
       def item_file
         create_temp_file(ITEM_DEF)
       end
-
-      def settings_custom_items
-        [
-          {
-            :type => 'item',
-            :icon => 'fa fa-bug',
-            :id   => 'custom_i1',
-            :name => 'Custom Item 1',
-            :href => 'https://www.redhat.com',
-            :rbac => 'vm_explorer'
-          },
-          {
-            :type => 'item',
-            :icon => 'pficon pficon-help',
-            :id   => 'custom_i2',
-            :name => 'Custom Item 2',
-            :href => 'https://www.hmpf.cz',
-            :rbac => 'vm_explorer'
-          }
-        ]
-      end
     end
   end
 end