Merge branch '08fastspec' of git://github.com/danielsdeleo/chef into danielsdeleo/08fastspec

Author: adamhjk

chef/lib/chef/client.rb

@@ -114,10 +114,10 @@ def run_solo
     end
 
     def run_ohai
-      if @ohai.keys
-        @ohai.refresh_plugins
+      if ohai.keys
+        ohai.refresh_plugins
       else
-        @ohai.all_plugins
+        ohai.all_plugins
       end
     end
 
@@ -127,7 +127,7 @@ def determine_node_name
         if Chef::Config[:node_name]
           @node_name = Chef::Config[:node_name]
         else
-          @node_name ||= @ohai[:fqdn] ? @ohai[:fqdn] : @ohai[:hostname]
+          @node_name ||= ohai[:fqdn] ? ohai[:fqdn] : ohai[:hostname]
           Chef::Config[:node_name] = @node_name
         end
         @safe_name = @node_name.gsub(/\./, '_')

chef/spec/unit/client_spec.rb

@@ -37,6 +37,17 @@
     to_stub.each do |method|
       @client.stub!(method).and_return(true)
     end
+    
+    @mock_ohai = {
+      :fqdn => "foo.bar.com",
+      :hostname => "foo"
+    }
+    @mock_ohai.stub!(:refresh_plugins).and_return(true)
+    Ohai::System.stub!(:new).and_return(@mock_ohai)
+    
+    @client.stub!(:run_ohai)
+    @client.stub!(:ohai).and_return(@mock_ohai)
+    
     time = Time.now
     Time.stub!(:now).and_return(time)
     Chef::Compile.stub!(:new).and_return(mock("Chef::Compile", :null_object => true))