summaryrefslogtreecommitdiff
path: root/spec/acceptance/zip_spec.rb
diff options
context:
space:
mode:
authortphoney <tp@puppet.com>2017-02-21 15:12:08 +0000
committertphoney <tp@puppet.com>2017-02-21 18:18:22 +0000
commit3fc7694d9fd46b4647eb562170af48ed819f64ab (patch)
tree6b8f238ec906ce081f7b4aba2e006b795465e746 /spec/acceptance/zip_spec.rb
parent8b510120701769258f8b58807953daaf3e73ced9 (diff)
remove unsupported platforms and future parser
Diffstat (limited to 'spec/acceptance/zip_spec.rb')
-rwxr-xr-xspec/acceptance/zip_spec.rb28
1 files changed, 5 insertions, 23 deletions
diff --git a/spec/acceptance/zip_spec.rb b/spec/acceptance/zip_spec.rb
index 7e586e2..ae22896 100755
--- a/spec/acceptance/zip_spec.rb
+++ b/spec/acceptance/zip_spec.rb
@@ -1,7 +1,7 @@
#! /usr/bin/env ruby -S rspec
require 'spec_helper_acceptance'
-describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+describe 'zip function' do
describe 'success' do
it 'zips two arrays of numbers together' do
pp = <<-EOS
@@ -10,11 +10,7 @@ describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operati
$output = zip($one,$two)
notice(inline_template('<%= @output.inspect %>'))
EOS
- if is_future_parser_enabled?
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, 5\], \[2, 6\], \[3, 7\], \[4, 8\]\]/)
- else
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", "5"\], \["2", "6"\], \["3", "7"\], \["4", "8"\]\]/)
- end
+ expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, 5\], \[2, 6\], \[3, 7\], \[4, 8\]\]/)
end
it 'zips two arrays of numbers & bools together' do
pp = <<-EOS
@@ -23,11 +19,7 @@ describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operati
$output = zip($one,$two)
notice(inline_template('<%= @output.inspect %>'))
EOS
- if is_future_parser_enabled?
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, true\], \[2, true\], \["three", false\], \[4, false\]\]/)
- else
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", true\], \["2", true\], \["three", false\], \["4", false\]\]/)
- end
+ expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, true\], \[2, true\], \["three", false\], \[4, false\]\]/)
end
it 'zips two arrays of numbers together and flattens them' do
# XXX This only tests the argument `true`, even though the following are valid:
@@ -40,11 +32,7 @@ describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operati
$output = zip($one,$two,true)
notice(inline_template('<%= @output.inspect %>'))
EOS
- if is_future_parser_enabled?
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[1, 5, 2, 6, 3, 7, 4, 8\]/)
- else
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "5", "2", "6", "3", "7", "4", "8"\]/)
- end
+ expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[1, 5, 2, 6, 3, 7, 4, 8\]/)
end
it 'handles unmatched length' do
# XXX Is this expected behavior?
@@ -54,11 +42,7 @@ describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operati
$output = zip($one,$two)
notice(inline_template('<%= @output.inspect %>'))
EOS
- if is_future_parser_enabled?
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, 5\], \[2, 6\]\]/)
- else
- expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", "5"\], \["2", "6"\]\]/)
- end
+ expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\[1, 5\], \[2, 6\]\]/)
end
end
describe 'failure' do
@@ -68,7 +52,6 @@ describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operati
$output = zip($one)
notice(inline_template('<%= @output.inspect %>'))
EOS
-
expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Wrong number of arguments/)
end
it 'handles improper argument types' do
@@ -78,7 +61,6 @@ describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operati
$output = zip($one,$two)
notice(inline_template('<%= @output.inspect %>'))
EOS
-
expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires array/)
end
end