refactor ohai stubs, remove hardcoding

2 files changed, 18 insertions, 17 deletions

diff --git a/spec/support/shared/context/client.rb b/spec/support/shared/context/client.rb
index aa1f473aae..e625185f7c 100644
--- a/spec/support/shared/context/client.rb
+++ b/spec/support/shared/context/client.rb
@@ -3,28 +3,28 @@ require 'spec_helper'
 
 # Stubs a basic client object
 shared_context "client" do
-  let(:hostname)    { "hostname" }
-  let(:machinename) { "machinename.example.org" }
-  let(:fqdn)        { "hostname.example.org" }
+  let(:fqdn)             { "hostname.example.org" }
+  let(:hostname)         { "hostname" }
+  let(:machinename)      { "machinename.example.org" }
+  let(:platform)         { "example-platform" }
+  let(:platform_version) { "example-platform-1.0" }
 
   let(:ohai_data) do
-    { :fqdn             => fqdn,
-      :hostname         => hostname,
-      :machinename      => machinename,
-      :platform         => 'example-platform',
-      :platform_version => 'example-platform-1.0',
-      :data             => {}
+    {
+      :fqdn =>             fqdn,
+      :hostname =>         hostname,
+      :machinename =>      machinename,
+      :platform =>         platform,
+      :platform_version => platform_version
     }
   end
 
   let(:ohai_system) do
-    ohai_system = double( "Ohai::System",
-                          :all_plugins => true,
-                          :data => ohai_data)
-    allow(ohai_system).to receive(:[]) do |key|
-      ohai_data[key]
+    ohai = instance_double("Ohai::System", :all_plugins => true, :data => ohai_data)
+    allow(ohai).to receive(:[]) do |k|
+      ohai_data[k]
     end
-    ohai_system
+    ohai
   end
 
   let(:node) do
diff --git a/spec/support/shared/examples/client.rb b/spec/support/shared/examples/client.rb
index 17eda195b8..0a57abc044 100644
--- a/spec/support/shared/examples/client.rb
+++ b/spec/support/shared/examples/client.rb
@@ -2,6 +2,7 @@
 require 'spec_helper'
 require 'spec/support/shared/context/client'
 
+# requires platform and platform_version be defined
 shared_examples "a completed run" do
   include_context "run completed"
 
@@ -10,8 +11,8 @@ shared_examples "a completed run" do
     expect(client.run).to be true
 
     # fork is stubbed, so we can see the outcome of the run
-    expect(node.automatic_attrs[:platform]).to eq("example-platform")
-    expect(node.automatic_attrs[:platform_version]).to eq("example-platform-1.0")
+    expect(node.automatic_attrs[:platform]).to eq(platform)
+    expect(node.automatic_attrs[:platform_version]).to eq(platform_version)
   end
 end