summaryrefslogtreecommitdiff
path: root/test/paths_test.rb
diff options
context:
space:
mode:
authorDan Allen <dan.j.allen@gmail.com>2018-04-27 20:10:54 -0600
committerGitHub <noreply@github.com>2018-04-27 20:10:54 -0600
commitebf076fee15f0d99810d8c2cebaa18fa505f0c9c (patch)
treed82bc08ffdd2065c9d547a655d7a2135c65e6107 /test/paths_test.rb
parent99b61d94fa0da2c8576e881a9d6a6a0d640c5bb5 (diff)
use consistent phrase to indicate the processor is automatically recovering from a problem (PR #2726)
Diffstat (limited to 'test/paths_test.rb')
-rw-r--r--test/paths_test.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/paths_test.rb b/test/paths_test.rb
index d761b6bd..a9a647df 100644
--- a/test/paths_test.rb
+++ b/test/paths_test.rb
@@ -134,17 +134,17 @@ context 'Path Resolver' do
test 'prevents access to paths outside of jail' do
result = @resolver.system_path '../../../../../css', %(#{JAIL}/assets/stylesheets), JAIL
assert_equal %(#{JAIL}/css), result
- assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail; recovering automatically'
@logger.clear
result = @resolver.system_path '/../../../../../css', %(#{JAIL}/assets/stylesheets), JAIL
assert_equal %(#{JAIL}/css), result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
result = @resolver.system_path '../../../css', '../../..', JAIL
assert_equal %(#{JAIL}/css), result
- assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail; recovering automatically'
end
test 'throws exception for illegal path access if recover is false' do
@@ -176,23 +176,23 @@ context 'Path Resolver' do
test 'treats absolute target outside of jail as relative when jail is specified' do
result = @resolver.system_path '/', "#{JAIL}/assets/stylesheets", JAIL
assert_equal JAIL, result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
result = @resolver.system_path '/foo', "#{JAIL}/assets/stylesheets", JAIL
assert_equal "#{JAIL}/foo", result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
result = @resolver.system_path '/../foo', "#{JAIL}/assets/stylesheets", JAIL
assert_equal "#{JAIL}/foo", result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
@resolver.file_separator = '\\'
result = @resolver.system_path 'baz.adoc', 'C:/foo', 'C:/bar'
assert_equal 'C:/bar/baz.adoc', result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
end
test 'allows use of absolute target or start if resolved path is sub-path of jail' do
@@ -214,18 +214,18 @@ context 'Path Resolver' do
test 'warns if start is not contained within jail' do
result = @resolver.system_path 'images/tiger.png', '/etc', JAIL
assert_equal %(#{JAIL}/images/tiger.png), result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
result = @resolver.system_path '.', '/etc', JAIL
assert_equal JAIL, result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
@resolver.file_separator = '\\'
result = @resolver.system_path '.', 'C:/foo', 'C:/bar'
assert_equal 'C:/bar', result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
end
test 'allows start path to be parent of jail if resolved target is inside jail' do
@@ -237,7 +237,7 @@ context 'Path Resolver' do
test 'relocates target to jail if resolved value fails outside of jail' do
result = @resolver.system_path 'bar/baz.adoc', JAIL, "#{JAIL}/foo"
assert_equal %(#{JAIL}/foo/bar/baz.adoc), result
- assert_message @logger, :WARN, 'path is outside of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path is outside of jail; recovering automatically'
@logger.clear
@resolver.file_separator = '\\'
@@ -301,7 +301,7 @@ context 'Path Resolver' do
assert_equal '/home/doctor/docs', (@resolver.system_path nil, '/home/doctor/./docs')
assert_equal %(#{pwd}/assets/images), (@resolver.system_path nil, 'assets/images')
@resolver.system_path '', '../assets/images', JAIL
- assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail; recovering automatically'
end
test 'posixifies windows paths' do
@@ -316,12 +316,12 @@ context 'Path Resolver' do
result = @resolver.system_path '..\\..', 'C:\\data\\docs\\assets', 'C:\\data\\docs'
assert_equal 'C:/data/docs', result
- assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail; recovering automatically'
@logger.clear
result = @resolver.system_path '..\\..\\css', 'C:\\data\\docs\\assets', 'C:\\data\\docs'
assert_equal 'C:/data/docs/css', result
- assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail, auto-recovering'
+ assert_message @logger, :WARN, 'path has illegal reference to ancestor of jail; recovering automatically'
end
test 'should calculate relative path' do