OC-8337: Architecture functional test coverage

6 files changed, 13 insertions, 13 deletions

diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb
index aaa4a9255e..d158ebc4ef 100644
--- a/lib/chef/provider/powershell_script.rb
+++ b/lib/chef/provider/powershell_script.rb
@@ -20,7 +20,7 @@ require 'chef/provider/windows_script'
 
 class Chef
   class Provider
-    class Powershell < Chef::Provider::WindowsScript
+    class PowershellScript < Chef::Provider::WindowsScript
 
       def initialize (new_resource, run_context)
         super(new_resource, run_context, '.ps1')
diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb
index e889573fd8..e0039428f2 100644
--- a/lib/chef/providers.rb
+++ b/lib/chef/providers.rb
@@ -37,7 +37,7 @@ require 'chef/provider/ohai'
 require 'chef/provider/mdadm'
 require 'chef/provider/mount'
 require 'chef/provider/package'
-require 'chef/provider/powershell'
+require 'chef/provider/powershell_script'
 require 'chef/provider/remote_directory'
 require 'chef/provider/remote_file'
 require 'chef/provider/route'
diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb
index e726e6f35a..e257eb2fb1 100644
--- a/lib/chef/resource/powershell_script.rb
+++ b/lib/chef/resource/powershell_script.rb
@@ -20,10 +20,10 @@ require 'chef/resource/windows_script'
 
 class Chef
   class Resource
-    class Powershell < Chef::Resource::WindowsScript
+    class PowershellScript < Chef::Resource::WindowsScript
 
       def initialize(name, run_context=nil)
-        super(name, run_context, :powershell, "powershell.exe")
+        super(name, run_context, :powershell_script, "powershell.exe")
       end
       
     end
diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb
index 1b295fc4e1..55c6a0dbf3 100644
--- a/lib/chef/resources.rb
+++ b/lib/chef/resources.rb
@@ -50,7 +50,7 @@ require 'chef/resource/package'
 require 'chef/resource/pacman_package'
 require 'chef/resource/perl'
 require 'chef/resource/portage_package'
-require 'chef/resource/powershell'
+require 'chef/resource/powershell_script'
 require 'chef/resource/python'
 require 'chef/resource/registry_key'
 require 'chef/resource/remote_directory'
diff --git a/spec/unit/provider/powershell_spec.rb b/spec/unit/provider/powershell_spec.rb
index 038de47742..15ad9a1353 100644
--- a/spec/unit/provider/powershell_spec.rb
+++ b/spec/unit/provider/powershell_spec.rb
@@ -17,7 +17,7 @@
 #
 
 require 'spec_helper'
-describe Chef::Provider::Powershell, "action_run" do
+describe Chef::Provider::PowershellScript, "action_run" do
 
   before(:each) do
     @node = Chef::Node.new
@@ -26,9 +26,9 @@ describe Chef::Provider::Powershell, "action_run" do
     @node.default["kernel"][:machine] = :x86_64.to_s
     
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Powershell.new('run some powershell code', @run_context)
+    @new_resource = Chef::Resource::PowershellScript.new('run some powershell code', @run_context)
 
-    @provider = Chef::Provider::Powershell.new(@new_resource, @run_context)
+    @provider = Chef::Provider::PowershellScript.new(@new_resource, @run_context)
   end
 
   it "should set the -command flag as the last flag" do
diff --git a/spec/unit/resource/powershell_spec.rb b/spec/unit/resource/powershell_spec.rb
index 22d5b5371b..6ec37583e6 100644
--- a/spec/unit/resource/powershell_spec.rb
+++ b/spec/unit/resource/powershell_spec.rb
@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe Chef::Resource::Powershell do
+describe Chef::Resource::PowershellScript do
 
   before(:each) do
     node = Chef::Node.new
@@ -28,18 +28,18 @@ describe Chef::Resource::Powershell do
 
     run_context = Chef::RunContext.new(node, nil, nil)
 
-    @resource = Chef::Resource::Powershell.new("powershell_unit_test", run_context)
+    @resource = Chef::Resource::PowershellScript.new("powershell_unit_test", run_context)
 
   end  
 
-  it "should create a new Chef::Resource::Powershell" do
-    @resource.should be_a_kind_of(Chef::Resource::Powershell)
+  it "should create a new Chef::Resource::PowershellScript" do
+    @resource.should be_a_kind_of(Chef::Resource::PowershellScript)
   end
   
   context "windowsscript" do
     let(:resource_instance) { @resource }
     let(:resource_instance_name ) { @resource.command }
-    let(:resource_name) { :powershell }
+    let(:resource_name) { :powershell_script }
     let(:interpreter_file_name) { 'powershell.exe' }
 
     it_should_behave_like "a Windows script resource"