rm unneeded mocks and stub better

Author: danielsdeleo

chef/spec/unit/provider/service/windows_spec.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,27 +22,17 @@
   before(:each) do
     @init_command = "sc"
     @node = mock("Chef::Node", :null_object => true)
-    @new_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :running => false
-    )
+    @new_resource = Chef::Resource::Service.new("chef")
     @new_resource.stub!(:pattern).and_return("chef")
     @new_resource.stub!(:status_command).and_return(false)
 
-    @current_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :running => false
-    )
+    @current_resource = Chef::Resource::Service.new("chef")
     @provider = Chef::Provider::Service::Windows.new(@node, @new_resource)
     Chef::Resource::Service.stub!(:new).and_return(@current_resource)
     IO.stub!(:popen).with("#{@init_command} query #{@new_resource.service_name}").and_return(['','','','4'])
-    IO.stub!(:popen).with("#{@init_command} qc #{@new_resource.service_name}").and_return(['','','','','2'])  
+    IO.stub!(:popen).with("#{@init_command} qc #{@new_resource.service_name}").and_return(['','','','','2'])
   end
-  
+
   it "should create a current resource with the name of the new resource" do
     Chef::Resource::Service.should_receive(:new).and_return(@current_resource)
     @provider.load_current_resource
@@ -61,125 +51,91 @@
 
 describe Chef::Provider::Service::Windows, "start_service" do
   before(:each) do
-    @new_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :start_command => "sc start chef",
-      :running => false
-    )
-    @new_resource.stub!(:start_command).and_return(false)
+    @new_resource = Chef::Resource::Service.new("chef")
+    @new_resource.start_command "sc start chef"
 
     @provider = Chef::Provider::Service::Windows.new(@node, @new_resource)
     Chef::Resource::Service.stub!(:new).and_return(@current_resource)
   end
-  
+
   it "should call the start command if one is specified" do
     @new_resource.stub!(:start_command).and_return("#{@new_resource.start_command}")
-    IO.stub!(:popen).with("#{@new_resource.start_command}").and_return(IO.new(2,'w'))
-    IO.popen("#{@new_resource.start_command}").stub!(:readlines).and_return(["foo\n","bar\n","baz\n","2 START_PENDING\n"])
+    IO.should_receive(:popen).with("#{@new_resource.start_command}").and_return(StringIO.new("foo\nbar\nbaz\n2 START_PENDING\n"))
     @provider.start_service()
   end
 end
 
 describe Chef::Provider::Service::Windows, "stop_service" do
   before(:each) do
     @init_command = "sc"
-    @new_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :stop_command => "sc stop chef",
-      :running => false
-    )
-    @new_resource.stub!(:stop_command).and_return(false)
+    @new_resource = Chef::Resource::Service.new("chef")
+    @new_resource.stop_command "sc stop chef"
 
     @provider = Chef::Provider::Service::Windows.new(@node, @new_resource)
     Chef::Resource::Service.stub!(:new).and_return(@current_resource)
   end
 
   it "should call the stop command if one is specified" do
     @new_resource.stub!(:stop_command).and_return("#{@new_resource.stop_command}")
-    IO.stub!(:popen).with("#{@new_resource.stop_command}").and_return(IO.new(2,'w'))
-    IO.popen("#{@new_resource.stop_command}").stub!(:readlines).and_return(["foo\n","bar\n","baz\n","1 STOPPED\n"])   
-    @provider.stop_service()
+    IO.should_receive(:popen).with("#{@new_resource.stop_command}").and_return(StringIO.new("foo\nbar\nbaz\n1 STOPPED\n"))
+    @provider.stop_service().should be_true
   end
 
   it "should use the built-in command if no stop command is specified" do
     @new_resource.stub!(:stop_command).and_return(nil)
     IO.stub!(:popen).with("#{@init_command} stop #{@new_resource.service_name}").and_return(IO.new(2,'w'))
-    IO.popen("#{@init_command} stop #{@new_resource.service_name}").stub!(:readlines).and_return(["foo\n","bar\n","baz\n","1 STOPPED\n"])   
-    @provider.stop_service()
+    IO.popen("#{@init_command} stop #{@new_resource.service_name}").stub!(:readlines).and_return(["foo\n","bar\n","baz\n","1 STOPPED\n"])
+    @provider.stop_service().should be_true
   end
 end
 
 describe Chef::Provider::Service::Windows, "restart_service" do
   before(:each) do
     @init_command = "sc"
-    @new_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :running => false
-    )
-    @new_resource.stub!(:restart_command).and_return(false)
-    @new_resource.stub!(:supports).and_return({:restart => false})
+    @new_resource = Chef::Resource::Service.new("chef")
 
     @provider = Chef::Provider::Service::Windows.new(@node, @new_resource)
     Chef::Resource::Service.stub!(:new).and_return(@current_resource)
   end
 
-  it "should just call stop, then start when the resource doesn't support restart and no restart_command is specified" do   
-    @new_resource.stub!(:restart_command).and_return(nil)
-    IO.stub!(:popen).with("#{@init_command} stop #{@new_resource.service_name}").and_return(IO.new(2,'w'))
-    IO.stub!(:popen).with("#{@init_command} start #{@new_resource.service_name}").and_return(IO.new(2,'w'))
-    IO.popen("#{@init_command} stop #{@new_resource.service_name}").stub!(:readlines).and_return(["foo\n","bar\n","baz\n","1 STOPPED\n"])
-    IO.popen("#{@init_command} start #{@new_resource.service_name}").stub!(:readlines).and_return(["foo\n","bar\n","baz\n","2 START_PENDING\n"])   
+  it "should just call stop, then start when the resource doesn't support restart and no restart_command is specified" do
+    IO.should_receive(:popen).with("#{@init_command} stop #{@new_resource.service_name}").and_return(StringIO.new("foo\nbar\nbaz\n1 STOPPED\n"))
+    IO.should_receive(:popen).with("#{@init_command} start #{@new_resource.service_name}").and_return(StringIO.new("foo\nbar\nbaz\n2 START_PENDING\n"))
     @provider.restart_service()
   end
 end
 
 describe Chef::Provider::Service::Windows, "enable_service" do
   before(:each) do
     @init_command = "sc"
-    @node = mock("Chef::Node", :null_object => true)
-    @new_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :status_command => false,
-      :running => false,
-      :enabled => false
-    )
+    @node = Chef::Node.new
+    @new_resource = Chef::Resource::Service.new("chef")
+    @new_resource.running  false
+    @new_resource.enabled  false
 
     @provider = Chef::Provider::Service::Windows.new(@node, @new_resource)
     Chef::Resource::Service.stub!(:new).and_return(@current_resource)
   end
 
   it "should enable service and set the startup type" do
-    @new_resource.stub!(:startup_type).and_return(:automatic)
-    IO.popen("sc config chef start= automatic").stub!(:readlines).and_return(["SUCCESS"])   
-    @provider.enable_service()
+    @new_resource.startup_type :automatic
+    IO.should_receive(:popen).with("sc config chef start= auto").and_return(StringIO.new("SUCCESS"))
+    @provider.enable_service().should be_true
   end
 end
 
 describe Chef::Provider::Service::Windows, "disable_service" do
   before(:each) do
-    @node = mock("Chef::Node", :null_object => true)
-    @new_resource = mock("Chef::Resource::Service",
-      :null_object => true,
-      :name => "chef",
-      :service_name => "chef",
-      :status_command => false
-    )
+    @node = Chef::Node.new
+    @new_resource = Chef::Resource::Service.new("chef")
 
     @provider = Chef::Provider::Service::Windows.new(@node, @new_resource)
     Chef::Resource::Service.stub!(:new).and_return(@current_resource)
   end
 
   it "should disable service" do
-    IO.popen("sc config chef start= disable").stub!(:readlines).and_return(["SUCCESS"])
-    @provider.disable_service()
+    IO.should_receive(:popen).with("sc config chef start= disabled").and_return(StringIO.new("SUCCESS"))
+    @provider.disable_service().should be_true
   end
 end