Merge pull request voxpupuli#762 from alexharv074/Issue_758

nginx version fact compatibility with Facter 1.7
slm0n87 · Feb 6, 2016 · 2ec06f3 · 2ec06f3
2 parents 56f407e + 0637222
commit 2ec06f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/facter/nginx_version.rb b/lib/facter/nginx_version.rb
@@ -1,7 +1,7 @@
 Facter.add(:nginx_version) do
   setcode do
-    if Facter::Core::Execution.which('nginx')
-      nginx_version = Facter::Core::Execution.execute('nginx -v 2>&1')
+    if Facter::Util::Resolution.which('nginx')
+      nginx_version = Facter::Util::Resolution.exec('nginx -v 2>&1')
       %r{^nginx version: nginx\/([\w\.]+)}.match(nginx_version)[1]
     end
   end

diff --git a/spec/unit/nginx_version_spec.rb b/spec/unit/nginx_version_spec.rb
@@ -8,8 +8,8 @@
   describe "nginx_version" do
     context 'with value' do
       before :each do
-        Facter::Core::Execution.stubs(:which).with('nginx').returns(true)
-        Facter::Core::Execution.stubs(:execute).with('nginx -v 2>&1').returns('nginx version: nginx/1.8.1')
+        Facter::Util::Resolution.stubs(:which).with('nginx').returns(true)
+        Facter::Util::Resolution.stubs(:exec).with('nginx -v 2>&1').returns('nginx version: nginx/1.8.1')
       end
       it {
         expect(Facter.fact(:nginx_version).value).to eq('1.8.1')