Commit 878d6939 authored by Samuel Giddins's avatar Samuel Giddins

Strip trailing whitespace in the integration spec execution output

A recent version of git has changed what whitespace it outputs
parent 20aaac25
...@@ -47,7 +47,7 @@ group :development do ...@@ -47,7 +47,7 @@ group :development do
# Integration tests # Integration tests
gem 'diffy' gem 'diffy'
gem 'clintegracon' gem 'clintegracon', :git => 'https://github.com/segiddins/CLIntegracon.git', :branch => 'segiddins/replacement-pattern-overlapping-replacements'
# Code Quality # Code Quality
gem 'inch_by_inch' gem 'inch_by_inch'
......
...@@ -93,6 +93,15 @@ GIT ...@@ -93,6 +93,15 @@ GIT
specs: specs:
cocoapods-try (1.1.0) cocoapods-try (1.1.0)
GIT
remote: https://github.com/segiddins/CLIntegracon.git
revision: 8bb9aa1fecd1731df996bda5cabc53fd746d2577
branch: segiddins/replacement-pattern-overlapping-replacements
specs:
clintegracon (0.8.1)
colored2 (~> 3.1)
diffy
GIT GIT
remote: https://github.com/segiddins/json.git remote: https://github.com/segiddins/json.git
revision: a9588bc4334c2f5bf985f255b61c05eafdcd8907 revision: a9588bc4334c2f5bf985f255b61c05eafdcd8907
...@@ -142,15 +151,11 @@ GEM ...@@ -142,15 +151,11 @@ GEM
cork cork
nap nap
open4 (~> 1.3) open4 (~> 1.3)
clintegracon (0.8.1)
colored (~> 1.2)
diffy
cocoapods-dependencies (1.0.0.beta.1) cocoapods-dependencies (1.0.0.beta.1)
ruby-graphviz (~> 1.2) ruby-graphviz (~> 1.2)
cocoapods_debug (0.1.0) cocoapods_debug (0.1.0)
pry (= 0.10.3) pry (= 0.10.3)
coderay (1.1.0) coderay (1.1.0)
colored (1.2)
colored2 (3.1.2) colored2 (3.1.2)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
cork (0.3.0) cork (0.3.0)
...@@ -267,7 +272,7 @@ DEPENDENCIES ...@@ -267,7 +272,7 @@ DEPENDENCIES
bacon bacon
bundler (~> 1.3) bundler (~> 1.3)
claide! claide!
clintegracon clintegracon!
cocoapods! cocoapods!
cocoapods-core! cocoapods-core!
cocoapods-deintegrate! cocoapods-deintegrate!
......
...@@ -149,6 +149,7 @@ describe_cli 'pod' do ...@@ -149,6 +149,7 @@ describe_cli 'pod' do
# This was changed in a very recent git version # This was changed in a very recent git version
s.replace_pattern /git checkout -b <new-branch-name>/, 'git checkout -b new_branch_name' s.replace_pattern /git checkout -b <new-branch-name>/, 'git checkout -b new_branch_name'
s.replace_pattern /[ \t]+(\r?$)/, '\1'
# git sometimes prints this, but not always ¯\_(ツ)_/¯ # git sometimes prints this, but not always ¯\_(ツ)_/¯
s.replace_pattern /^\s*Checking out files.*done\./, '' s.replace_pattern /^\s*Checking out files.*done\./, ''
......
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