summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-22 15:34:35 -0700
committerTim Smith <tsmith@chef.io>2018-03-22 15:34:35 -0700
commitcee8fed38987f280028df9f334583143a78d46b1 (patch)
tree7283c45bf2b172f965ea34969572b5b9d1aa2f76
parent7b7a918a0b60e6c1bc7e5da6947db453f7b6dc4a (diff)
downloadchef-cee8fed38987f280028df9f334583143a78d46b1.tar.gz
Rename to windows_ad_join
This allows us to have windows_ad_* in the future Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/windows_ad_join.rb (renamed from lib/chef/resource/windows_adjoin.rb)6
-rw-r--r--lib/chef/resources.rb2
-rw-r--r--spec/unit/resource/windows_ad_join.rb (renamed from spec/unit/resource/windows_adjoin.rb)4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/resource/windows_adjoin.rb b/lib/chef/resource/windows_ad_join.rb
index edc2effe26..b0f66cf2c0 100644
--- a/lib/chef/resource/windows_adjoin.rb
+++ b/lib/chef/resource/windows_ad_join.rb
@@ -21,12 +21,12 @@ require "chef/mixin/powershell_out"
class Chef
class Resource
class WindowsAdJoin < Chef::Resource
- resource_name :windows_adjoin
- provides :windows_adjoin
+ resource_name :windows_ad_join
+ provides :windows_ad_join
include Chef::Mixin::PowershellOut
- description "Use the windows_adjoin resource to join a Windows Active Directory domain."
+ description "Use the windows_ad_join resource to join a Windows Active Directory domain."
introduced "14.0"
property :domain_name, String,
diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb
index f5e113054b..e123cc5915 100644
--- a/lib/chef/resources.rb
+++ b/lib/chef/resources.rb
@@ -114,7 +114,7 @@ require "chef/resource/zypper_repository"
require "chef/resource/cab_package"
require "chef/resource/powershell_package"
require "chef/resource/msu_package"
-require "chef/resource/windows_adjoin"
+require "chef/resource/windows_ad_join"
require "chef/resource/windows_auto_run"
require "chef/resource/windows_feature"
require "chef/resource/windows_feature_dism"
diff --git a/spec/unit/resource/windows_adjoin.rb b/spec/unit/resource/windows_ad_join.rb
index 02975d5d4e..7fd02c2021 100644
--- a/spec/unit/resource/windows_adjoin.rb
+++ b/spec/unit/resource/windows_ad_join.rb
@@ -20,8 +20,8 @@ require "spec_helper"
describe Chef::Resource::WindowsAdJoin do
let(:resource) { Chef::Resource::WindowsAdJoin.new("example.com") }
- it "sets resource name as :windows_adjoin" do
- expect(resource.resource_name).to eql(:windows_adjoin)
+ it "sets resource name as :windows_ad_join" do
+ expect(resource.resource_name).to eql(:windows_ad_join)
end
it "sets the domain_name as its name" do