seed plugins from content/dialogs

ManageIQ · Apr 5, 2017 · f7a5f3d · f7a5f3d
1 parent a2cf41b
commit f7a5f3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/models/miq_dialog.rb b/app/models/miq_dialog.rb
@@ -2,8 +2,6 @@ class MiqDialog < ApplicationRecord
   validates :name, :description, :presence => true
   validates :name, :uniqueness => { :scope => :dialog_type, :case_sensitive => false }
 
-  DIALOG_DIR = "product/dialogs/miq_dialogs".freeze
-
   DIALOG_TYPES = [
     [_("VM Provision"),                "MiqProvisionWorkflow"],
     [_("Configured System Provision"), "MiqProvisionConfiguredSystemWorkflow"],
@@ -14,18 +12,17 @@ class MiqDialog < ApplicationRecord
   serialize :content
 
   def self.seed
-    sync_from_dir(Rails.root)
+    sync_from_dir(Rails.root.join('product', 'dialogs', 'miq_dialogs'))
     sync_from_plugins
   end
 
   def self.sync_from_dir(root)
-    root = root.join(DIALOG_DIR)
     Dir.glob(root.join("*.yaml")).each { |f| sync_from_file(f, root) }
   end
 
   def self.sync_from_plugins
     Vmdb::Plugins.instance.registered_provider_plugins.each do |plugin|
-      sync_from_dir(plugin.root)
+      sync_from_dir(plugin.root.join('content', 'miq_dialogs'))
     end
   end
 

diff --git a/spec/models/miq_dialog_spec.rb b/spec/models/miq_dialog_spec.rb
@@ -1,7 +1,7 @@
 describe MiqDialog do
   context '.seed' do
     it 'seeds from the core with correct metadata' do
-      root = Rails.root.join(described_class::DIALOG_DIR)
+      root = Rails.root.join('product', 'dialogs', 'miq_dialogs')
       allow(described_class).to receive(:find_by)
 
       expect(described_class).to receive(:sync_from_file).at_least(:once).with(/^#{root}/, root).and_call_original
@@ -20,7 +20,9 @@
 
       described_class.seed
 
-      expect(described_class).to have_received(:sync_from_dir).at_least(:once).with(mock_engine.root)
+      expect(described_class).to have_received(:sync_from_dir).at_least(:once).with(
+        mock_engine.root.join('content', 'miq_dialogs')
+      )
     end
   end
 end