aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2018-04-24 05:09:29 +0100
committerGitHub <noreply@github.com>2018-04-24 05:09:29 +0100
commita3ecf4ff1dbb92259e1627bdd09546211f25d906 (patch)
treef4f85edafbaf15885617b8eeb77f85f28e17e2bb /actionpack
parent7391ab45684fca1fa46e5b56569a595e73285c55 (diff)
parent7a5886b2b8f18eaec1b858b2ecbcd9e5403fa90d (diff)
downloadrails-a3ecf4ff1dbb92259e1627bdd09546211f25d906.tar.gz
rails-a3ecf4ff1dbb92259e1627bdd09546211f25d906.tar.bz2
rails-a3ecf4ff1dbb92259e1627bdd09546211f25d906.zip
Merge pull request #32708 from bdewater/base64-screenshot
Use strict_encode64 instead of gsub newline for ScreenshotHelper
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb b/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
index 2c8cee3a9b..d2685e0452 100644
--- a/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
+++ b/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
@@ -80,7 +80,7 @@ module ActionDispatch
end
def inline_base64(path)
- Base64.encode64(path).gsub("\n", "")
+ Base64.strict_encode64(path)
end
def failed?