Merge branch 'master' into FACT-2542

puppetlabs · Apr 29, 2020 · fbc22d7 · fbc22d7
2 parents 25a3007 + a341e9c
commit fbc22d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/framework/detector/os_hierarchy.rb b/lib/framework/detector/os_hierarchy.rb
@@ -4,7 +4,7 @@ module Facter
   class OsHierarchy
     def initialize
       @log = Log.new(self)
-      json_file = Util::FileHelper.safe_read('os_hierarchy.json')
+      json_file = Util::FileHelper.safe_read(File.join(ROOT_DIR, 'os_hierarchy.json'))
 
       begin
         @json_os_hierarchy = JSON.parse(json_file)

diff --git a/spec/framework/detector/os_hierarchy_spec.rb b/spec/framework/detector/os_hierarchy_spec.rb
@@ -6,7 +6,7 @@
   before do
     allow(Facter::Util::FileHelper)
       .to receive(:safe_read)
-      .with('os_hierarchy.json')
+      .with(File.join(ROOT_DIR, 'os_hierarchy.json'))
       .and_return(load_fixture('os_hierarchy').read)
     allow(Facter::Log).to receive(:new).and_return(log)
   end
@@ -18,7 +18,7 @@
       before do
         allow(Facter::Util::FileHelper)
           .to receive(:safe_read)
-          .with('os_hierarchy.json')
+          .with(File.join(ROOT_DIR, 'os_hierarchy.json'))
           .and_return(load_fixture('broken_os_hierarchy').read)
       end