Skip to content

C
cocoapods
Commit a9f5d195 authored by Samuel E. Giddins's avatar Samuel E. Giddins
Browse files
Options

Merge pull request #3770 from CocoaPods/seg-integration-clean-plugins 

[Integration] Fix cleaning of plugin paths
parents e3786c79 0c462b9c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Gemfile.lock
View file @ a9f5d195
GIT GIT
remote: https://github.com/CocoaPods/CLAide.git remote: https://github.com/CocoaPods/CLAide.git
revision: 3bca84abc774bcc5257fce86ebf29514cee05657 revision: 8965360f53b753a3a23351485a75df7c867f3d2c
branch: master branch: master
specs: specs:
claide (0.9.0) claide (0.9.0)
......
cocoapods-integration-specs @ cb5ab020
Subproject commit 99cf7a48d31f8d48aff0266d46ae950b4c28d804 Subproject commit cb5ab02002d307af0a569ee5473a3d5e31322136
spec/integration.rb
View file @ a9f5d195
...@@ -121,7 +121,7 @@ describe_cli 'pod' do ...@@ -121,7 +121,7 @@ describe_cli 'pod' do
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' }ix, '`\1/lib/cocoapods_plugin.rb'
......
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