Commit 252f7055 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[IntegrationSpecs] Ignore curl progress output

parent deefeaf5
Subproject commit 964bcae651605ad37cc20897e1ad1a6e84e86a2b Subproject commit 748ad0dac4f5660eba1d191efa89e0fc8d791b0e
...@@ -124,16 +124,25 @@ describe_cli 'pod' do ...@@ -124,16 +124,25 @@ describe_cli 'pod' do
s.replace_path `which git`.chomp, 'GIT_BIN' s.replace_path `which git`.chomp, 'GIT_BIN'
s.replace_path `which hg`.chomp, 'HG_BIN' if has_mercurial s.replace_path `which hg`.chomp, 'HG_BIN' if has_mercurial
s.replace_path `which bash`.chomp, 'BASH_BIN' s.replace_path `which bash`.chomp, 'BASH_BIN'
s.replace_path `which curl`.chomp, 'CURL_BIN'
s.replace_user_path 'Library/Caches/CocoaPods', 'CACHES_DIR' s.replace_user_path 'Library/Caches/CocoaPods', 'CACHES_DIR'
s.replace_pattern /#{Dir.tmpdir}\/[\w-]+/i, 'TMPDIR' s.replace_pattern /#{Dir.tmpdir}\/[\w-]+/io, 'TMPDIR'
s.replace_pattern /\d{4}-\d\d-\d\d \d\d:\d\d:\d\d [-+]\d{4}/, '<#DATE#>' s.replace_pattern /\d{4}-\d\d-\d\d \d\d:\d\d:\d\d [-+]\d{4}/, '<#DATE#>'
s.replace_pattern /\(Took \d+.\d+ seconds\)/, '(Took <#DURATION#> seconds)' s.replace_pattern /\(Took \d+.\d+ seconds\)/, '(Took <#DURATION#> seconds)'
s.replace_path %r{ s.replace_path %r{
`[^`]*? # The opening backtick on a plugin path `[^`]*? # The opening backtick on a plugin path
([[[:alnum:]]_+-]+?) # The plugin name ([[[:alnum:]]_+-]+?) # The plugin name
(- ([[:xdigit:]]+ | #{Gem::Version::VERSION_PATTERN}))? # The version or SHA (- ([[:xdigit:]]+ | #{Gem::Version::VERSION_PATTERN}))? # The version or SHA
/lib/cocoapods_plugin.rb # The actual plugin file that gets loaded /lib/cocoapods_plugin.rb # The actual plugin file that gets loaded
}ix, '`\1/lib/cocoapods_plugin.rb' }iox, '`\1/lib/cocoapods_plugin.rb'
s.replace_pattern %r{
^(\s* \$ \s (CURL_BIN | #{`which curl`.strip}) .* \n)
^\s* % \s* Total .* \n
^\s* Dload \s* Upload .* \n
(^\s* [[:cntrl:]] .* \n)+
}iox, "\\1\n"
end end
describe 'Pod install' do describe 'Pod install' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment