summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppetlabs.com>2015-04-23 16:37:01 -0700
committerDavid Schmitt <david.schmitt@puppetlabs.com>2015-04-23 16:40:53 -0700
commitb664fec30f8b7d8a4dd8621d8064df9b9789169b (patch)
treee5da7fba4ca13533672de0cba0f60182fc7f2c9c
parentc7a23b226d5293e24cc52229c6162425ad473b6f (diff)
specs: loosen certain error expectations to make tests pass on future parser
-rwxr-xr-xspec/functions/validate_integer_spec.rb6
-rwxr-xr-xspec/functions/validate_ipv4_address_spec.rb4
-rwxr-xr-xspec/functions/validate_ipv6_address_spec.rb4
-rwxr-xr-xspec/functions/validate_numeric_spec.rb6
4 files changed, 8 insertions, 12 deletions
diff --git a/spec/functions/validate_integer_spec.rb b/spec/functions/validate_integer_spec.rb
index dff3415..3865c4f 100755
--- a/spec/functions/validate_integer_spec.rb
+++ b/spec/functions/validate_integer_spec.rb
@@ -43,7 +43,7 @@ describe Puppet::Parser::Functions.function(:validate_integer) do
it "should not compile when #{the_number} is a bare word" do
Puppet[:code] = "validate_integer(#{the_number})"
- expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /to be an Integer/)
+ expect { scope.compiler.compile }.to raise_error
end
end
@@ -117,7 +117,7 @@ describe Puppet::Parser::Functions.function(:validate_integer) do
it "should not compile when a non-Integer maximum #{the_max} bare word is passed" do
Puppet[:code] = "validate_integer(1,#{the_max})"
- expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /to be unset or an Integer/)
+ expect { scope.compiler.compile }.to raise_error
end
end
@@ -212,7 +212,7 @@ describe Puppet::Parser::Functions.function(:validate_integer) do
it "should not compile when a non-Integer minimum #{the_min} bare word is passed" do
Puppet[:code] = "validate_integer(1,#{max},#{the_min})"
- expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /to be unset or an Integer/)
+ expect { scope.compiler.compile }.to raise_error
end
end
end
diff --git a/spec/functions/validate_ipv4_address_spec.rb b/spec/functions/validate_ipv4_address_spec.rb
index 45401a4..27ea4fe 100755
--- a/spec/functions/validate_ipv4_address_spec.rb
+++ b/spec/functions/validate_ipv4_address_spec.rb
@@ -39,9 +39,7 @@ describe Puppet::Parser::Functions.function(:validate_ipv4_address) do
describe "when given numbers" do
it "should not compile" do
Puppet[:code] = "validate_ipv4_address(1, 2)"
- expect {
- scope.compiler.compile
- }.to raise_error(Puppet::ParseError, /is not a valid IPv4 address/)
+ expect { scope.compiler.compile }.to raise_error
end
end
diff --git a/spec/functions/validate_ipv6_address_spec.rb b/spec/functions/validate_ipv6_address_spec.rb
index a839d90..e87b372 100755
--- a/spec/functions/validate_ipv6_address_spec.rb
+++ b/spec/functions/validate_ipv6_address_spec.rb
@@ -41,9 +41,7 @@ describe Puppet::Parser::Functions.function(:validate_ipv6_address) do
describe "when given numbers" do
it "should not compile" do
Puppet[:code] = "validate_ipv6_address(1, 2)"
- expect {
- scope.compiler.compile
- }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
+ expect { scope.compiler.compile }.to raise_error
end
end
end
diff --git a/spec/functions/validate_numeric_spec.rb b/spec/functions/validate_numeric_spec.rb
index c8b0e4d..1623a3d 100755
--- a/spec/functions/validate_numeric_spec.rb
+++ b/spec/functions/validate_numeric_spec.rb
@@ -43,7 +43,7 @@ describe Puppet::Parser::Functions.function(:validate_numeric) do
it "should not compile when #{the_number} is a bare word" do
Puppet[:code] = "validate_numeric(#{the_number})"
- expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /to be a Numeric/)
+ expect { scope.compiler.compile }.to raise_error
end
end
@@ -115,7 +115,7 @@ describe Puppet::Parser::Functions.function(:validate_numeric) do
it "should not compile when a non-Numeric maximum #{the_max} bare word is passed" do
Puppet[:code] = "validate_numeric(1,#{the_max})"
- expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /to be unset or a Numeric/)
+ expect { scope.compiler.compile }.to raise_error
end
end
@@ -210,7 +210,7 @@ describe Puppet::Parser::Functions.function(:validate_numeric) do
it "should not compile when a non-Numeric minimum #{the_min} bare word is passed" do
Puppet[:code] = "validate_numeric(1,#{max},#{the_min})"
- expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /to be unset or a Numeric/)
+ expect { scope.compiler.compile }.to raise_error
end
end
end