(FACT-2555) Fix os hierarchy for intermediary nodes. Add tests for in…

…termediary and root nodes.

lib/framework/detector/os_hierarchy.rb

@@ -2,8 +2,6 @@
 
 module Facter
   class OsHierarchy
-    @searched_path = []
-
     def initialize
       json_file = Util::FileHelper.safe_read('os_hierarchy.json')
       @json_data = JSON.parse(json_file)
@@ -33,6 +31,8 @@ def search(json_data, searched_element, path)
         next unless tree_node.is_a?(Hash)
 
         tree_node.each do |k, v|
+          return @searched_path = path.dup << k if k == searched_element
+
           search(v, searched_element, path << k)
           path.pop
         end

spec/framework/detector/os_hierarchy_spec.rb

@@ -19,6 +19,22 @@
       end
     end
 
+    context 'when searched_os is debian' do
+      it 'constructs hierarchy' do
+        hierarchy = os_hierarchy.construct_hierarchy(:debian)
+
+        expect(hierarchy).to eq(%w[Linux Debian])
+      end
+    end
+
+    context 'when searched_os is linux' do
+      it 'constructs hierarchy' do
+        hierarchy = os_hierarchy.construct_hierarchy(:linux)
+
+        expect(hierarchy).to eq(%w[Linux])
+      end
+    end
+
     context 'when searched_os is nil' do
       it 'constructs hierarchy' do
         hierarchy = os_hierarchy.construct_hierarchy(nil)