Merge pull request #6105 from Stromweld/patch-1

Updated to fix day validation with monthly frequency

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/chef/resource/windows_task.rb b/lib/chef/resource/windows_task.rb
index 52dec381e0..f9c0599c49 100644
--- a/lib/chef/resource/windows_task.rb
+++ b/lib/chef/resource/windows_task.rb
@@ -161,8 +161,8 @@ class Chef
       end
 
       def validate_create_day(day, frequency)
-        unless [:weekly].include?(frequency)
-          raise "day attribute is only valid for tasks that run weekly"
+        unless [:weekly, :monthly].include?(frequency)
+          raise "day attribute is only valid for tasks that run monthly or weekly"
         end
         if day.is_a?(String) && day.to_i.to_s != day
           days = day.split(",")
diff --git a/spec/unit/resource/windows_task_spec.rb b/spec/unit/resource/windows_task_spec.rb
index fa2d458bbb..2b3ee16024 100644
--- a/spec/unit/resource/windows_task_spec.rb
+++ b/spec/unit/resource/windows_task_spec.rb
@@ -166,8 +166,8 @@ describe Chef::Resource::WindowsTask do
   end
 
   context "#validate_create_day" do
-    it "raises error if frequency is not :weekly" do
-      expect  { resource.send(:validate_create_day, "Mon", :monthly) }.to raise_error("day attribute is only valid for tasks that run weekly")
+    it "raises error if frequency is not :weekly or :monthly" do
+      expect  { resource.send(:validate_create_day, "Mon", :once) }.to raise_error("day attribute is only valid for tasks that run monthly or weekly")
     end
 
     it "accepts a valid single day" do