chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

data/spec/unit/provider/user/dscl_spec.rb

@@ -21,7 +21,7 @@ require "ostruct"
 
 describe Chef::Provider::User::Dscl do
   before do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
   end
 
   let(:shellcmdresult) { Struct.new(:stdout, :stderr, :exitstatus) }

data/spec/unit/provider_resolver_spec.rb

@@ -35,9 +35,8 @@ describe Chef::ProviderResolver do
   # Root the filesystem under a temp directory so Chef.path_to will point at it
   when_the_repository "is empty" do
     before do
-      allow(Chef).to receive(:path_to) { |path| File.join(path_to(""), path) }
+      allow(Chef::Resource::DnfPackage).to receive(:which).with("dnf").and_return(nil)
     end
-
     let(:resource_name) { :service }
     let(:provider) { nil }
     let(:action) { :start }
@@ -145,51 +144,36 @@ describe Chef::ProviderResolver do
 
     describe "resolving service resource" do
       def stub_service_providers(*services)
-        services.each do |service|
-          case service
-          when :debian
-            file "usr/sbin/update-rc.d", ""
-          when :invokercd
-            file "usr/sbin/invoke-rc.d", ""
-          when :insserv
-            file "sbin/insserv", ""
-          when :upstart
-            file "sbin/initctl", ""
-          when :redhat
-            file "sbin/chkconfig", ""
-          when :systemd
-            file "proc/1/comm", "systemd\n"
-          else
-            raise ArgumentError, service
-          end
+        allowed = %i{debianrcd invokercd insserv upstart redhatrcd systemd}
+
+        (allowed - services).each do |api|
+          allow(Chef::Provider::Service).to receive(:"#{api}?").and_return(false)
+        end
+
+        raise ArgumentError unless (services - allowed).empty?
+
+        services.each do |api|
+          allow(Chef::Provider::Service).to receive(:"#{api}?").and_return(true)
         end
       end
 
       def stub_service_configs(*configs)
-        configs.each do |config|
-          case config
-          when :initd
-            file "etc/init.d/#{service_name}", ""
-          when :upstart
-            file "etc/init/#{service_name}.conf", ""
-          when :xinetd
-            file "etc/xinetd.d/#{service_name}", ""
-          when :etc_rcd
-            file "etc/rc.d/#{service_name}", ""
-          when :usr_local_etc_rcd
-            file "usr/local/etc/rc.d/#{service_name}", ""
-          when :systemd
-            file "proc/1/comm", "systemd\n"
-            file "etc/systemd/system/#{service_name}.service", ""
-          else
-            raise ArgumentError, config
-          end
+        allowed = %i{initd upstart xinetd systemd etc_rcd}
+
+        (allowed - configs).each do |type|
+          allow(Chef::Provider::Service).to receive(:service_script_exist?).with(type, service_name).and_return(false)
+        end
+
+        raise ArgumentError unless (configs - allowed).empty?
+
+        configs.each do |type|
+          allow(Chef::Provider::Service).to receive(:service_script_exist?).with(type, service_name).and_return(true)
         end
       end
 
       shared_examples_for "an ubuntu platform with upstart, update-rc.d and systemd" do
         before do
-          stub_service_providers(:debian, :invokercd, :upstart, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :upstart, :systemd)
         end
 
         it "when both the SysV init and Systemd script exists, it returns a Service::Debian provider" do
@@ -213,12 +197,12 @@ describe Chef::ProviderResolver do
         end
 
         it "when only the SysV init script exists, it returns a Service::Systemd provider" do
-          stub_service_configs(:initd)
+          stub_service_configs(:initd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Systemd)
         end
 
         it "when both SysV and Upstart scripts exist, it returns a Service::Systemd provider" do
-          stub_service_configs(:initd, :upstart)
+          stub_service_configs(:initd, :systemd, :upstart)
           expect(resolved_provider).to eql(Chef::Provider::Service::Systemd)
         end
 
@@ -235,7 +219,7 @@ describe Chef::ProviderResolver do
 
       shared_examples_for "an ubuntu platform with upstart and update-rc.d" do
         before do
-          stub_service_providers(:debian, :invokercd, :upstart)
+          stub_service_providers(:debianrcd, :invokercd, :upstart)
         end
 
         # needs to be handled by the highest priority init.d handler
@@ -362,7 +346,7 @@ describe Chef::ProviderResolver do
       shared_examples_for "a debian platform using the insserv provider" do
         context "with a default install" do
           before do
-            stub_service_providers(:debian, :invokercd, :insserv)
+            stub_service_providers(:debianrcd, :invokercd, :insserv)
           end
 
           it "uses the Service::Insserv Provider to manage sysv init scripts" do
@@ -378,7 +362,7 @@ describe Chef::ProviderResolver do
 
         context "when the user has installed upstart" do
           before do
-            stub_service_providers(:debian, :invokercd, :insserv, :upstart)
+            stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart)
           end
 
           it "when only the SysV init script exists, it returns an Insserv  provider" do
@@ -407,8 +391,8 @@ describe Chef::ProviderResolver do
         it_behaves_like "an ubuntu platform with upstart, update-rc.d and systemd"
 
         it "when the unit-files are missing and system-ctl list-unit-files returns an error" do
-          stub_service_providers(:debian, :invokercd, :upstart, :systemd)
-          stub_service_configs(:initd, :upstart)
+          stub_service_providers(:debianrcd, :invokercd, :upstart, :systemd)
+          stub_service_configs(:initd, :upstart, :systemd)
           mock_shellout_command("/bin/systemctl list-unit-files", exitstatus: 1)
           expect(resolved_provider).to eql(Chef::Provider::Service::Systemd)
         end
@@ -445,8 +429,8 @@ describe Chef::ProviderResolver do
 
         it "always returns a Solaris provider" do
           # no matter what we stub on the next two lines we should get a Solaris provider
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
-          stub_service_configs(:initd, :upstart, :xinetd, :usr_local_etc_rcd, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
+          stub_service_configs(:initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Solaris)
         end
       end
@@ -460,8 +444,8 @@ describe Chef::ProviderResolver do
 
         it "always returns a Windows provider" do
           # no matter what we stub on the next two lines we should get a Windows provider
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
-          stub_service_configs(:initd, :upstart, :xinetd, :usr_local_etc_rcd, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
+          stub_service_configs(:initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Windows)
         end
       end
@@ -475,8 +459,8 @@ describe Chef::ProviderResolver do
 
         it "always returns a Macosx provider" do
           # no matter what we stub on the next two lines we should get a Macosx provider
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
-          stub_service_configs(:initd, :upstart, :xinetd, :usr_local_etc_rcd, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
+          stub_service_configs(:initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Macosx)
         end
       end
@@ -484,7 +468,6 @@ describe Chef::ProviderResolver do
       on_platform "freebsd", os: "freebsd", platform_version: "10.3" do
         it "returns a Freebsd provider if it finds the /usr/local/etc/rc.d initscript" do
           stub_service_providers
-          stub_service_configs(:usr_local_etc_rcd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Freebsd)
         end
 
@@ -495,15 +478,14 @@ describe Chef::ProviderResolver do
         end
 
         it "always returns a Freebsd provider if it finds the /usr/local/etc/rc.d initscript" do
-          # should only care about :usr_local_etc_rcd stub in the service configs
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
-          stub_service_configs(:usr_local_etc_rcd, :initd, :upstart, :xinetd, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
+          stub_service_configs(:initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Freebsd)
         end
 
         it "always returns a Freebsd provider if it finds the /usr/local/etc/rc.d initscript" do
           # should only care about :etc_rcd stub in the service configs
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
           stub_service_configs(:etc_rcd, :initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Freebsd)
         end
@@ -518,7 +500,6 @@ describe Chef::ProviderResolver do
       on_platform "netbsd", os: "netbsd", platform_version: "7.0.1" do
         it "returns a Freebsd provider if it finds the /usr/local/etc/rc.d initscript" do
           stub_service_providers
-          stub_service_configs(:usr_local_etc_rcd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Freebsd)
         end
 
@@ -529,15 +510,14 @@ describe Chef::ProviderResolver do
         end
 
         it "always returns a Freebsd provider if it finds the /usr/local/etc/rc.d initscript" do
-          # should only care about :usr_local_etc_rcd stub in the service configs
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
-          stub_service_configs(:usr_local_etc_rcd, :initd, :upstart, :xinetd, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
+          stub_service_configs(:initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Freebsd)
         end
 
         it "always returns a Freebsd provider if it finds the /usr/local/etc/rc.d initscript" do
           # should only care about :etc_rcd stub in the service configs
-          stub_service_providers(:debian, :invokercd, :insserv, :upstart, :redhat, :systemd)
+          stub_service_providers(:debianrcd, :invokercd, :insserv, :upstart, :redhatrcd, :systemd)
           stub_service_configs(:etc_rcd, :initd, :upstart, :xinetd, :systemd)
           expect(resolved_provider).to eql(Chef::Provider::Service::Freebsd)
         end

data/spec/unit/resource/chef_sleep_spec.rb

@@ -0,0 +1,30 @@
+#
+# Copyright:: 2019, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::ChefSleep do
+  let(:resource) { Chef::Resource::ChefSleep.new("30") }
+
+  it "sets the default action as :sleep" do
+    expect(resource.action).to eql([:sleep])
+  end
+
+  it "sleep is the name property and it coerces to an Integer" do
+    expect(resource.seconds).to eql(30)
+  end
+end

data/spec/unit/resource/cookbook_file_spec.rb

@@ -53,7 +53,7 @@ describe Chef::Resource::CookbookFile do
 
   describe "when it has a backup number, group, mode, owner, source, checksum, and cookbook on nix or path, rights, deny_rights, checksum on windows" do
     before do
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         resource.path("C:/temp/origin/file.txt")
         resource.rights(:read, "Everyone")
         resource.deny_rights(:full_control, "Clumsy_Sam")
@@ -70,7 +70,7 @@ describe Chef::Resource::CookbookFile do
 
     it "describes the state" do
       state = resource.state_for_resource_reporter
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         puts state
         expect(state[:rights]).to eq([{ permissions: :read, principals: "Everyone" }])
         expect(state[:deny_rights]).to eq([{ permissions: :full_control, principals: "Clumsy_Sam" }])
@@ -83,7 +83,7 @@ describe Chef::Resource::CookbookFile do
     end
 
     it "returns the path as its identity" do
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         expect(resource.identity).to eq("C:/temp/origin/file.txt")
       else
         expect(resource.identity).to eq("/tmp/origin/file.txt")

data/spec/unit/resource/remote_file_spec.rb

@@ -181,7 +181,7 @@ describe Chef::Resource::RemoteFile do
 
   describe "when it has group, mode, owner, source, and checksum" do
     before do
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         resource.path("C:/temp/origin/file.txt")
         resource.rights(:read, "Everyone")
         resource.deny_rights(:full_control, "Clumsy_Sam")
@@ -197,7 +197,7 @@ describe Chef::Resource::RemoteFile do
 
     it "describes its state" do
       state = resource.state_for_resource_reporter
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         puts state
         expect(state[:rights]).to eq([{ permissions: :read, principals: "Everyone" }])
         expect(state[:deny_rights]).to eq([{ permissions: :full_control, principals: "Clumsy_Sam" }])
@@ -210,7 +210,7 @@ describe Chef::Resource::RemoteFile do
     end
 
     it "returns the path as its identity" do
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         expect(resource.identity).to eq("C:/temp/origin/file.txt")
       else
         expect(resource.identity).to eq("/this/path/")

data/spec/unit/resource/windows_firewall_rule_spec.rb

@@ -141,20 +141,32 @@ describe Chef::Resource::WindowsFirewallRule do
 
   it "the profile property accepts :public, :private, :domain, :any and :notapplicable" do
     resource.profile(:public)
-    expect(resource.profile).to eql(:public)
+    expect(resource.profile).to eql([:public])
     resource.profile(:private)
-    expect(resource.profile).to eql(:private)
+    expect(resource.profile).to eql([:private])
     resource.profile(:domain)
-    expect(resource.profile).to eql(:domain)
+    expect(resource.profile).to eql([:domain])
     resource.profile(:any)
-    expect(resource.profile).to eql(:any)
+    expect(resource.profile).to eql([:any])
     resource.profile(:notapplicable)
-    expect(resource.profile).to eql(:notapplicable)
+    expect(resource.profile).to eql([:notapplicable])
+  end
+
+  it "the profile property raises on any unknown values" do
+    expect { resource.profile(:other) }.to raise_error(Chef::Exceptions::ValidationFailed)
+    expect { resource.profile(%i{public other}) }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 
   it "the profile property coerces strings to symbols" do
     resource.profile("Public")
-    expect(resource.profile).to eql(:public)
+    expect(resource.profile).to eql([:public])
+    resource.profile([:private, "Public"])
+    expect(resource.profile).to eql(%i{private public})
+  end
+
+  it "the profile property supports multiple profiles" do
+    resource.profile(%w{Private Public})
+    expect(resource.profile).to eql(%i{private public})
   end
 
   it "the program property accepts strings" do
@@ -237,7 +249,17 @@ describe Chef::Resource::WindowsFirewallRule do
 
       it "sets LocalPort" do
         resource.local_port("80")
-        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -LocalPort 80 -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -LocalPort '80' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets LocalPort with int" do
+        resource.local_port(80)
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -LocalPort '80' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets multiple LocalPorts" do
+        resource.local_port(%w{80 RPC})
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -LocalPort '80', 'RPC' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
       end
 
       it "sets RemoteAddress" do
@@ -247,7 +269,17 @@ describe Chef::Resource::WindowsFirewallRule do
 
       it "sets RemotePort" do
         resource.remote_port("443")
-        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -RemotePort 443 -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -RemotePort '443' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets RemotePort with int" do
+        resource.remote_port(443)
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -RemotePort '443' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets multiple RemotePorts" do
+        resource.remote_port(%w{443 445})
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -RemotePort '443', '445' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
       end
 
       it "sets Direction" do
@@ -270,6 +302,11 @@ describe Chef::Resource::WindowsFirewallRule do
         expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'private' -InterfaceType 'any' -Enabled 'true'")
       end
 
+      it "sets multiple Profiles (must be comma-plus-space delimited for PowerShell to treat as an array)" do
+        resource.profile(%i{private public})
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'private', 'public' -InterfaceType 'any' -Enabled 'true'")
+      end
+
       it "sets Program" do
         resource.program("C:/calc.exe")
         expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule' -DisplayName 'test_rule' -Description 'Firewall rule' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -Program 'C:/calc.exe' -InterfaceType 'any' -Enabled 'true'")
@@ -305,7 +342,7 @@ describe Chef::Resource::WindowsFirewallRule do
         resource.service("SomeService")
         resource.interface_type(:remoteaccess)
         resource.enabled(false)
-        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule_the_second' -DisplayName 'test_rule_the_second' -Description 'some other rule' -LocalAddress '192.168.40.40' -LocalPort 80 -RemoteAddress '8.8.4.4' -RemotePort 8081 -Direction 'outbound' -Protocol 'UDP' -Action 'notconfigured' -Profile 'domain' -Program '%WINDIR%\\System32\\lsass.exe' -Service 'SomeService' -InterfaceType 'remoteaccess' -Enabled 'false'")
+        expect(provider.firewall_command("New")).to eql("New-NetFirewallRule -Name 'test_rule_the_second' -DisplayName 'test_rule_the_second' -Description 'some other rule' -LocalAddress '192.168.40.40' -LocalPort '80' -RemoteAddress '8.8.4.4' -RemotePort '8081' -Direction 'outbound' -Protocol 'UDP' -Action 'notconfigured' -Profile 'domain' -Program '%WINDIR%\\System32\\lsass.exe' -Service 'SomeService' -InterfaceType 'remoteaccess' -Enabled 'false'")
       end
     end
 
@@ -326,7 +363,17 @@ describe Chef::Resource::WindowsFirewallRule do
 
       it "sets LocalPort" do
         resource.local_port("80")
-        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -LocalPort 80 -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -LocalPort '80' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets LocalPort with int" do
+        resource.local_port(80)
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -LocalPort '80' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets multiple LocalPorts (must be comma-plus-space delimited for PowerShell to treat as an array)" do
+        resource.local_port(%w{80 8080})
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -LocalPort '80', '8080' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
       end
 
       it "sets RemoteAddress" do
@@ -336,7 +383,17 @@ describe Chef::Resource::WindowsFirewallRule do
 
       it "sets RemotePort" do
         resource.remote_port("443")
-        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -RemotePort 443 -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -RemotePort '443' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets RemotePort with int" do
+        resource.remote_port(443)
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -RemotePort '443' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
+      end
+
+      it "sets multiple RemotePorts (must be comma-plus-space delimited for PowerShell to treat as an array)" do
+        resource.remote_port(%w{443 445})
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule' -Description 'Firewall rule' -RemotePort '443', '445' -Direction 'inbound' -Protocol 'TCP' -Action 'allow' -Profile 'any' -InterfaceType 'any' -Enabled 'true'")
       end
 
       it "sets Direction" do
@@ -394,7 +451,7 @@ describe Chef::Resource::WindowsFirewallRule do
         resource.service("SomeService")
         resource.interface_type(:remoteaccess)
         resource.enabled(false)
-        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule_the_second' -Description 'some other rule' -LocalAddress '192.168.40.40' -LocalPort 80 -RemoteAddress '8.8.4.4' -RemotePort 8081 -Direction 'outbound' -Protocol 'UDP' -Action 'notconfigured' -Profile 'domain' -Program '%WINDIR%\\System32\\lsass.exe' -Service 'SomeService' -InterfaceType 'remoteaccess' -Enabled 'false'")
+        expect(provider.firewall_command("Set")).to eql("Set-NetFirewallRule -Name 'test_rule_the_second' -Description 'some other rule' -LocalAddress '192.168.40.40' -LocalPort '80' -RemoteAddress '8.8.4.4' -RemotePort '8081' -Direction 'outbound' -Protocol 'UDP' -Action 'notconfigured' -Profile 'domain' -Program '%WINDIR%\\System32\\lsass.exe' -Service 'SomeService' -InterfaceType 'remoteaccess' -Enabled 'false'")
       end
     end
   end