summaryrefslogtreecommitdiff
path: root/spec/unit/mixin/windows_architecture_helper_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/unit/mixin/windows_architecture_helper_spec.rb')
-rw-r--r--spec/unit/mixin/windows_architecture_helper_spec.rb23
1 files changed, 10 insertions, 13 deletions
diff --git a/spec/unit/mixin/windows_architecture_helper_spec.rb b/spec/unit/mixin/windows_architecture_helper_spec.rb
index 25064678fa..aaf9fa4b2b 100644
--- a/spec/unit/mixin/windows_architecture_helper_spec.rb
+++ b/spec/unit/mixin/windows_architecture_helper_spec.rb
@@ -16,12 +16,9 @@
# limitations under the License.
#
-
require "spec_helper"
require "chef/mixin/windows_architecture_helper"
-
-
describe Chef::Mixin::WindowsArchitectureHelper do
include Chef::Mixin::WindowsArchitectureHelper
@@ -34,25 +31,25 @@ describe Chef::Mixin::WindowsArchitectureHelper do
end
it "returns true when valid architectures are passed to valid_windows_architecture?" do
- @valid_architectures.each do | architecture |
+ @valid_architectures.each do |architecture|
expect(valid_windows_architecture?(architecture)).to eq(true)
end
end
it "returns false when invalid architectures are passed to valid_windows_architecture?" do
- @invalid_architectures.each do | architecture |
+ @invalid_architectures.each do |architecture|
expect(valid_windows_architecture?(architecture)).to eq(false)
end
end
it "does not raise an exception when a valid architecture is passed to assert_valid_windows_architecture!" do
- @valid_architectures.each do | architecture |
+ @valid_architectures.each do |architecture|
assert_valid_windows_architecture!(architecture)
end
end
it "raises an error if an invalid architecture is passed to assert_valid_windows_architecture!" do
- @invalid_architectures.each do | architecture |
+ @invalid_architectures.each do |architecture|
begin
expect(assert_valid_windows_architecture!(architecture)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
rescue Chef::Exceptions::Win32ArchitectureIncorrect
@@ -61,26 +58,26 @@ describe Chef::Mixin::WindowsArchitectureHelper do
end
it "returns true only for supported desired architecture passed to node_supports_windows_architecture" do
- with_node_architecture_combinations do | node, desired_arch |
- expect(node_supports_windows_architecture?(node, desired_arch)).to be true if (node_windows_architecture(node) == :x86_64 || desired_arch == :i386 )
- expect(node_supports_windows_architecture?(node, desired_arch)).to be false if (node_windows_architecture(node) == :i386 && desired_arch == :x86_64 )
+ with_node_architecture_combinations do |node, desired_arch|
+ expect(node_supports_windows_architecture?(node, desired_arch)).to be true if (node_windows_architecture(node) == :x86_64 || desired_arch == :i386 )
+ expect(node_supports_windows_architecture?(node, desired_arch)).to be false if (node_windows_architecture(node) == :i386 && desired_arch == :x86_64 )
end
end
it "returns true only when forced_32bit_override_required? has 64-bit node architecture and 32-bit desired architecture" do
- with_node_architecture_combinations do | node, desired_arch |
+ with_node_architecture_combinations do |node, desired_arch|
expect(forced_32bit_override_required?(node, desired_arch)).to be true if ((node_windows_architecture(node) == :x86_64) && (desired_arch == :i386) && !is_i386_process_on_x86_64_windows?)
expect(forced_32bit_override_required?(node, desired_arch)).to be false if ! ((node_windows_architecture(node) == :x86_64) && (desired_arch == :i386))
end
end
def with_node_architecture_combinations
- @valid_architectures.each do | node_architecture |
+ @valid_architectures.each do |node_architecture|
new_node = Chef::Node.new
new_node.default["kernel"] = Hash.new
new_node.default["kernel"][:machine] = node_architecture.to_s
- @valid_architectures.each do | architecture |
+ @valid_architectures.each do |architecture|
yield new_node, architecture if block_given?
end
end