Commit 57f33651 authored by Samuel Giddins's avatar Samuel Giddins

[IntegrationSpecs] Use fix for transformed paths

parent 9430c120
...@@ -126,7 +126,7 @@ GEM ...@@ -126,7 +126,7 @@ GEM
parser (~> 2.2) parser (~> 2.2)
awesome_print (1.6.1) awesome_print (1.6.1)
bacon (1.2.0) bacon (1.2.0)
clintegracon (0.8.0) clintegracon (0.8.1)
colored (~> 1.2) colored (~> 1.2)
diffy diffy
cocoapods-dependencies (0.5.1) cocoapods-dependencies (0.5.1)
......
...@@ -215,12 +215,6 @@ begin ...@@ -215,12 +215,6 @@ begin
end end
end end
# Remove files not used for the comparison
# To keep the git diff clean
files_to_delete = FileList['spec/cocoapods-integration-specs/*/after/{Podfile,*.podspec,**/*.xcodeproj,PodTest-hg-source}', '.DS_Store']
files_to_delete.exclude('spec/cocoapods-integration-specs/init_single_platform/**/*.*')
rm_rf files_to_delete
puts puts
puts 'Integration fixtures updated, commit and push in the `spec/cocoapods-integration-specs` submodule' puts 'Integration fixtures updated, commit and push in the `spec/cocoapods-integration-specs` submodule'
end end
......
...@@ -66,25 +66,23 @@ CLIntegracon.configure do |c| ...@@ -66,25 +66,23 @@ CLIntegracon.configure do |c|
# Creates a YAML representation of the Xcodeproj files # Creates a YAML representation of the Xcodeproj files
# which should be used as a reference for comparison. # which should be used as a reference for comparison.
xcodeproj = Xcodeproj::Project.open(path) xcodeproj = Xcodeproj::Project.open(path)
FileUtils.rm_rf(path) yaml = xcodeproj.to_yaml
File.open("#{path}.yaml", 'w') do |file| path.rmtree
file.write xcodeproj.to_yaml path.open('w') { |f| f << yaml }
end
end end
c.transform_produced '**/*.framework' do |path| c.transform_produced '**/*.framework' do |path|
tree = FileTree.to_tree(path) tree = FileTree.to_tree(path)
FileUtils.rm_rf path path.rmtree
File.open(path, 'w') { |f| f << tree } path.open('w') { |f| f << tree }
end end
# Register special handling for YAML files # Register special handling for YAML files
paths = [/Podfile\.lock/, /Manifest\.lock$/] c.transform_produced '**/{Podfile,Manifest}.lock' do |path|
c.preprocess(*paths) do |path|
# Remove CocoaPods version # Remove CocoaPods version
yaml = File.open(path) { |f| YAML.load(f) } yaml = YAML.load(path.read)
yaml.delete('COCOAPODS') yaml.delete('COCOAPODS')
YAML.dump(yaml) path.open('w') { |f| f << YAML.dump(yaml) }
end end
# So we don't need to compare them directly # So we don't need to compare them directly
...@@ -98,7 +96,7 @@ CLIntegracon.configure do |c| ...@@ -98,7 +96,7 @@ CLIntegracon.configure do |c|
# Needed for some test cases # Needed for some test cases
c.ignores '*.podspec' c.ignores '*.podspec'
c.ignores 'PodTest-hg-source/**' c.ignores 'PodTest-hg-source/**/*'
c.hook_into :bacon c.hook_into :bacon
end end
......
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