@@ -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.
@@ -40,6 +40,8 @@
     Chef::FileCache.stub!(:has_key).and_return(false)
     Chef::FileCache.stub!(:move_to).and_return(true)
     Chef::FileCache.stub!(:load).and_return("monkeypoop")
+
+    Chef::REST.stub!(:new).and_return(@rest)
   end
 
   describe "action_create" do
@@ -51,106 +53,99 @@
       after do
         Chef::Config[:solo] = false
       end
-    
+
       it "should load the correct file from the FileCache" do
         Chef::Config[:file_cache_path] = '/var/chef'
         @provider.stub!(:find_preferred_file).and_return('/var/chef/site-cookbooks/joe/templates/default/joe.erb')
         Chef::FileCache.should_receive(:load).with('site-cookbooks/joe/templates/default/joe.erb').and_return('joe template')
-        do_action_create
+        @provider.action_create
       end
     end
-  
-    def do_action_create
-      Chef::REST.stub!(:new).and_return(@rest)    
-      @provider.action_create
-    end
-  
+
     it "should get the template based on the resources source value" do
       @rest.should_receive(:get_rest).with(@resource.source, true).and_return(@tempfile)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should use the cookbook name if defined in the template resource" do
       @resource.cookbook "jane"
       @resource.source "template.erb"
       @provider.should_receive(:fetch_template_via_rest).with("cookbooks/jane/templates/default/template.erb", "jane_template.erb")
-      do_action_create
+      @provider.action_create
     end
-    
+
     it "should set the checksum of the new resource to the value of the returned template" do
-      #@resource.should_receive(:checksum).with("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa").once
-      #@resource.should_receive(:checksum).twice
-      do_action_create
+      @provider.action_create
       @resource.checksum.should == "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa"
     end
-  
+
     it "should not copy the tempfile to the real file if the checksums match" do
       FileUtils.should_not_receive(:cp)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should copy the tempfile to the real file if the checksums do not match" do
       @provider.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924ab")
       FileUtils.should_receive(:mv).with("/tmp/foo", CHEF_SPEC_DATA + '/templates/seattle.txt').once
       @provider.stub!(:backup).and_return(true)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should set the owner if provided" do
       @resource.owner("adam")
       @provider.should_receive(:set_owner).and_return(true)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should set the group if provided" do
       @resource.group("adam")
       @provider.should_receive(:set_group).and_return(true)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should set the mode if provided" do
       @resource.mode(0676)
       @provider.should_receive(:set_mode).and_return(true)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should build a checksum of the file in the cache (assuming it exists)" do
       Chef::FileCache.stub!(:has_key?).and_return(true)
       Chef::FileCache.stub!(:load).and_return("/some/path")
       @provider.should_receive(:checksum).with("/some/path")
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should not update the filecache if the template has not been modified on the server" do
       error_response = mock("Net::HTTPNotModified", { :kind_of? => true })
       @rest.stub!(:get_rest).and_raise(Net::HTTPRetriableError.new("foo", error_response))
       Chef::FileCache.should_not_receive(:move_to)
-      do_action_create
+      @provider.action_create
     end
-  
+
     it "should raise an exception if we get a Net::HTTPRetriableError that is not from a NotModified response" do
       error_response = mock("Net::HTTPNotModified", { :kind_of? => false })
       @rest.stub!(:get_rest).and_raise(Net::HTTPRetriableError.new("foo", error_response))
-      lambda { do_action_create }.should raise_error(Net::HTTPRetriableError)
+      lambda { @provider.action_create }.should raise_error(Net::HTTPRetriableError)
     end
-  
+
     it "should populate the template_cache as true after rendering once" do
-      do_action_create
+      @provider.action_create
       @node.run_state[:template_cache]["#{@resource.cookbook_name}_#{@resource.source}"].should eql(true)
     end
-  
+
     it "should not update the FileCache for the template on the second pass" do
-      do_action_create
+      @provider.action_create
       Chef::FileCache.should_not_receive(:move_to)
       @tempfile = StringIO.new
       @tempfile.stub!(:path).and_return("/tmp/foo")
       Tempfile.stub!(:open).and_yield(@tempfile)
-      do_action_create
+      @provider.action_create
     end
   end
-  
+
   describe "action_create_if_missing" do
-    
+
     it "should not call action_create if the new resources path exists" do
       File.stub!(:exists?).and_return(true)
       @provider.should_not_receive(:action_create)
@@ -179,6 +174,6 @@ def do_action_create
       @provider.generate_url('default/something', "templates").should eql("cookbooks/daft/templates?id=default/something&platform=monkey&version=1.0&fqdn=monkeynode&node_name=latte")
     end
   end
-  
+
 end