Skip to content

C
cocoapods
Commit 38ce1e77 authored by Marius Rackwitz's avatar Marius Rackwitz
Browse files
Options

Merge pull request #2899 from CocoaPods/fix_integration_spec_after_reachability_update 

[IntegrationSpec] Fixed after Reachability update
parents 76c22f49 ea67cd91
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
Gemfile.lock
View file @ 38ce1e77
...@@ -95,7 +95,7 @@ GEM ...@@ -95,7 +95,7 @@ GEM
parser (>= 2.2.0.pre.3, < 3.0) parser (>= 2.2.0.pre.3, < 3.0)
awesome_print (1.2.0) awesome_print (1.2.0)
bacon (1.2.0) bacon (1.2.0)
clintegracon (0.6.0) clintegracon (0.6.1)
colored (~> 1.2) colored (~> 1.2)
diffy diffy
cocoapods-dependencies (0.4.0) cocoapods-dependencies (0.4.0)
......
cocoapods-integration-specs @ 186e33ca
Subproject commit 73e3fc31ddf867b0b4eb641fa5c5d8aecc3d5ac1 Subproject commit 186e33cacc6152362725a2f392612292cb8fc836
spec/integration.rb
View file @ 38ce1e77
...@@ -91,12 +91,14 @@ end ...@@ -91,12 +91,14 @@ end
describe_cli 'pod' do describe_cli 'pod' do
has_mercurial = system('which hg') Process.wait(spawn('which hg', :err => :out, :out => '/dev/null'))
has_mercurial = $?.success?
subject do |s| subject do |s|
s.executable = "ruby #{ROOT + 'bin/pod'}" s.executable = "ruby #{ROOT + 'bin/pod'}"
s.environment_vars = { s.environment_vars = {
'CP_AGGRESSIVE_CACHE' => 'TRUE', 'CP_REPOS_DIR' => ROOT + 'spec/fixtures/spec-repos',
'CP_AGGRESSIVE_CACHE' => 'TRUE',
'XCODEPROJ_DISABLE_XCPROJ' => 'TRUE', 'XCODEPROJ_DISABLE_XCPROJ' => 'TRUE',
'CLAIDE_DISABLE_AUTO_WRAP' => 'TRUE', 'CLAIDE_DISABLE_AUTO_WRAP' => 'TRUE',
} }
......
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