fix tests for content provider

1 files changed, 13 insertions, 16 deletions

diff --git a/spec/unit/mixin/template_spec.rb b/spec/unit/mixin/template_spec.rb
index f5e5181a62..e86adcc9d8 100644
--- a/spec/unit/mixin/template_spec.rb
+++ b/spec/unit/mixin/template_spec.rb
@@ -60,12 +60,9 @@ describe Chef::Mixin::Template, "render_template" do
 
       @resource = Chef::Resource::Template.new(@rendered_file_location)
       @resource.cookbook_name = 'openldap'
-
-      @provider = Chef::Provider::Template.new(@resource, @run_context)
       @current_resource = @resource.dup
-      @provider.current_resource = @current_resource
-      @access_controls = mock("access controls")
-      @provider.stub!(:access_controls).and_return(@access_controls)
+
+      @content_provider = Chef::Provider::File::Content::Template.new(@resource, @current_resource, @run_context)
 
       @template_context = {}
       @template_context[:node] = @node
@@ -73,7 +70,7 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should provide a render method" do
-      @provider.render_template("before {<%= render 'test.erb' %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'test.erb' %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {We could be diving for pearls!\n} after"
       end
     end
@@ -84,7 +81,7 @@ describe Chef::Mixin::Template, "render_template" do
         tf.puts "test"
         tf.rewind
 
-        @provider.render_template("before {<%= render '#{tf.path}', :local => true %>} after", @template_context) do |tmp|
+        @content_provider.render_template("before {<%= render '#{tf.path}', :local => true %>} after", @template_context) do |tmp|
           tmp.open.read.should == "before {test\n} after"
         end
       ensure
@@ -95,7 +92,7 @@ describe Chef::Mixin::Template, "render_template" do
     it "should render partials from a different cookbook" do
       @template_context[:template_finder] = Chef::Provider::TemplateFinder.new(@run_context, 'apache2', @node)
 
-      @provider.render_template("before {<%= render 'test.erb', :cookbook => 'openldap' %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'test.erb', :cookbook => 'openldap' %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {We could be diving for pearls!\n} after"
       end
     end
@@ -106,7 +103,7 @@ describe Chef::Mixin::Template, "render_template" do
         tf.puts "test"
         tf.rewind
 
-        @provider.render_template("before {<%= render 'something', :local => true, :source => '#{tf.path}' %>} after", @template_context) do |tmp|
+        @content_provider.render_template("before {<%= render 'something', :local => true, :source => '#{tf.path}' %>} after", @template_context) do |tmp|
           tmp.open.read.should == "before {test\n} after"
         end
       ensure
@@ -117,7 +114,7 @@ describe Chef::Mixin::Template, "render_template" do
     it "should pass the node to partials" do
       @node.normal[:slappiness] = "happiness"
 
-      @provider.render_template("before {<%= render 'openldap_stuff.conf.erb' %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'openldap_stuff.conf.erb' %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {slappiness is happiness} after"
       end
     end
@@ -125,13 +122,13 @@ describe Chef::Mixin::Template, "render_template" do
     it "should pass the original variables to partials" do
       @template_context[:secret] = 'candy'
 
-      @provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb' %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb' %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {super secret is candy} after"
       end
     end
 
     it "should pass variables to partials" do
-      @provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {:secret => 'whatever' } %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {:secret => 'whatever' } %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {super secret is whatever} after"
       end
     end
@@ -139,17 +136,17 @@ describe Chef::Mixin::Template, "render_template" do
     it "should pass variables to partials even if they are named the same" do
       @template_context[:secret] = 'one'
 
-      @provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {:secret => 'two' } %>} after <%= @secret %>", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {:secret => 'two' } %>} after <%= @secret %>", @template_context) do |tmp|
         tmp.open.read.should == "before {super secret is two} after one"
       end
     end
 
     it "should pass nil for missing variables in partials" do
-      @provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {} %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb', :variables => {} %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {super secret is } after"
       end
 
-      @provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb' %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render 'openldap_variable_stuff.conf.erb' %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {super secret is } after"
       end
     end
@@ -157,7 +154,7 @@ describe Chef::Mixin::Template, "render_template" do
     it "should render nested partials" do
       path = File.expand_path(File.join(CHEF_SPEC_DATA, "partial_one.erb"))
 
-      @provider.render_template("before {<%= render '#{path}', :local => true %>} after", @template_context) do |tmp|
+      @content_provider.render_template("before {<%= render '#{path}', :local => true %>} after", @template_context) do |tmp|
         tmp.open.read.should == "before {partial one We could be diving for pearls!\n calling home\n} after"
       end
     end