summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <mcquin@users.noreply.github.com>2015-09-04 11:24:49 -0700
committerClaire McQuin <mcquin@users.noreply.github.com>2015-09-04 11:24:49 -0700
commitd03b2a082b61899ec04c32b38d95025c56783d80 (patch)
treeaffb76dc10841508c67dbe0f98d5f9dc6479bffe
parentd6cda2252c6bb318a88f44db9b878dd279bb0e46 (diff)
parentc6312348f0639de965309009a190b8700289ce60 (diff)
downloadchef-d03b2a082b61899ec04c32b38d95025c56783d80.tar.gz
Merge pull request #3877 from chef/mcquin/rename-registry-specs
Modify registry specs to adhere to spec naming conventions
-rw-r--r--spec/functional/win32/registry_spec.rb (renamed from spec/functional/win32/registry_helper_spec.rb)19
-rw-r--r--spec/unit/win32/registry_spec.rb (renamed from spec/unit/registry_helper_spec.rb)2
2 files changed, 1 insertions, 20 deletions
diff --git a/spec/functional/win32/registry_helper_spec.rb b/spec/functional/win32/registry_spec.rb
index ba0ae12495..dcfc49e2b3 100644
--- a/spec/functional/win32/registry_helper_spec.rb
+++ b/spec/functional/win32/registry_spec.rb
@@ -20,25 +20,6 @@
require 'spec_helper'
require 'chef/win32/registry'
-describe Chef::Resource::RegistryKey, :unix_only do
- before(:all) do
- events = Chef::EventDispatch::Dispatcher.new
- node = Chef::Node.new
- ohai = Ohai::System.new
- ohai.all_plugins
- node.consume_external_attrs(ohai.data,{})
- run_context = Chef::RunContext.new(node, {}, events)
- @resource = Chef::Resource::RegistryKey.new("HKCU\\Software", run_context)
- end
- context "when load_current_resource is run on a non-windows node" do
- it "throws an exception because you don't have a windows registry (derp)" do
- @resource.key("HKCU\\Software\\Opscode")
- @resource.values([{:name=>"Color", :type=>:string, :data=>"Orange"}])
- expect{@resource.run_action(:create)}.to raise_error(Chef::Exceptions::Win32NotWindows)
- end
- end
-end
-
describe 'Chef::Win32::Registry', :windows_only do
before(:all) do
diff --git a/spec/unit/registry_helper_spec.rb b/spec/unit/win32/registry_spec.rb
index a30608add7..fdd3e85a8c 100644
--- a/spec/unit/registry_helper_spec.rb
+++ b/spec/unit/win32/registry_spec.rb
@@ -18,7 +18,7 @@
require 'spec_helper'
-describe Chef::Provider::RegistryKey do
+describe Chef::Win32::Registry do
let(:value1) { { :name => "one", :type => :string, :data => "1" } }
let(:value1_upcase_name) { {:name => "ONE", :type => :string, :data => "1"} }