Commit 38ce1e77 authored by Marius Rackwitz's avatar Marius Rackwitz

Merge pull request #2899 from CocoaPods/fix_integration_spec_after_reachability_update

[IntegrationSpec] Fixed after Reachability update
parents 76c22f49 ea67cd91
......@@ -95,7 +95,7 @@ GEM
parser (>= 2.2.0.pre.3, < 3.0)
awesome_print (1.2.0)
bacon (1.2.0)
clintegracon (0.6.0)
clintegracon (0.6.1)
colored (~> 1.2)
diffy
cocoapods-dependencies (0.4.0)
......
Subproject commit 73e3fc31ddf867b0b4eb641fa5c5d8aecc3d5ac1
Subproject commit 186e33cacc6152362725a2f392612292cb8fc836
......@@ -91,12 +91,14 @@ end
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|
s.executable = "ruby #{ROOT + 'bin/pod'}"
s.environment_vars = {
'CP_AGGRESSIVE_CACHE' => 'TRUE',
'CP_REPOS_DIR' => ROOT + 'spec/fixtures/spec-repos',
'CP_AGGRESSIVE_CACHE' => 'TRUE',
'XCODEPROJ_DISABLE_XCPROJ' => '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