Reference the integration spec files from a submodule pointing to…

Reference the integration spec files from a submodule pointing to CocoaPods/cocoapods-integration-specs

.gitmodules

@@ -17,3 +17,6 @@
 [submodule "spec/fixtures/integration/Reachability"]
 	path = spec/fixtures/integration/Reachability
 	url = https://github.com/tonymillion/Reachability.git
+[submodule "spec/cocoapods-integration-specs"]
+	path = spec/cocoapods-integration-specs
+	url = https://github.com/CocoaPods/cocoapods-integration-specs

Rakefile

@@ -182,7 +182,12 @@ namespace :spec do
   #--------------------------------------#
 
   desc "Run the integration spec"
-  task :integration => :unpack_fixture_tarballs do
+  task :integration do
+    unless File.exists?('spec/cocoapods-integration-specs')
+      $stderr.puts "Integration files not checked out. Run `rake bootstrap`"
+      exit 1
+    end
+
     sh "bundle exec bacon spec/integration.rb"
   end
 
@@ -268,7 +273,7 @@ namespace :spec do
     title 'Storing fixtures'
     # Copy the files to the files produced by the specs to the after folders
     FileList['tmp/*'].each do |source|
-      destination = "spec/integration/#{source.gsub('tmp/','')}/after"
+      destination = "spec/cocoapods-integration-specs/#{source.gsub('tmp/','')}/after"
       if File.exists?(destination)
         sh "rm -rf #{destination}"
         sh "mv #{source} #{destination}"
@@ -280,6 +285,9 @@ namespace :spec do
     FileList['spec/integration/*/after/{Podfile,*.podspec,**/*.xcodeproj,PodTest-hg-source}'].each do |to_delete|
       sh "rm -rf #{to_delete}"
     end
+
+    puts
+    puts "Integration fixtures updated, commit and push in the `spec/cocoapods-integration-specs` submodule"
   end
 
   #--------------------------------------#

cocoapods-integration-specs @ 44b03f0a

+Subproject commit 44b03f0ae223452272211d52f2fee15472bd0b7a

spec/integration.rb

@@ -73,7 +73,7 @@ POD_BINARY = "ruby " + ROOT.to_s + '/bin/pod' unless defined? POD_BINARY
 #         the name of the folder of the tests.
 #
 def copy_files(folder)
-  source = File.expand_path("../integration/#{folder}/before", __FILE__)
+  source = File.expand_path("../cocoapods-integration-specs/#{folder}/before", __FILE__)
   destination = TMP_DIR + folder
   destination.mkpath
   FileUtils.cp_r(Dir.glob("#{source}/*"), destination)
@@ -135,7 +135,7 @@ end
 #         the name of the folder of the tests.
 #
 def check_with_folder(folder)
-  source = File.expand_path("../integration/#{folder}", __FILE__)
+  source = File.expand_path("../cocoapods-integration-specs/#{folder}", __FILE__)
   Dir.glob("#{source}/after/**/*") do |expected_path|
     next unless File.file?(expected_path)
     relative_path = expected_path.gsub("#{source}/after/", '')
@@ -297,7 +297,7 @@ end
 
 #-----------------------------------------------------------------------------#
 
-describe "Integration take 2" do
+describe "Integration" do
   TMP_DIR.rmtree if TMP_DIR.exist?
   TMP_DIR.mkpath