Skip to content

Commit

Permalink
Fix #2832 - integration specs for date&time-dependant output
Browse files Browse the repository at this point in the history
  • Loading branch information
AliSoftware committed Nov 14, 2014
1 parent 9a41405 commit 7d99430
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions Rakefile
Expand Up @@ -187,6 +187,7 @@ begin
task :rebuild_integration_fixtures do
title 'Running Integration tests'
sh 'rm -rf spec/cocoapods-integration-specs/tmp'
title 'Building all the fixtures'

This comment has been minimized.

Copy link
@segiddins

segiddins Nov 14, 2014

Member

if you're adding this, I'd remove the title 'Running Integration tests'

This comment has been minimized.

Copy link
@AliSoftware

AliSoftware Nov 14, 2014

Author Contributor

Yeah, I added this because when I ran be rake spec:rebuild_integration_fixtures, I though something was wrong as the script seem to froze after the rm -rf and I wondered if it got stalled.

But maybe I should have moved the Running Integration tests on this line instead…

puts `bundle exec bacon spec/integration.rb`

title 'Storing fixtures'
Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs
Submodule cocoapods-integration-specs updated 48 files
+5 −5 init_single_platform/after/SampleApp.xcodeproj.yaml
+48 −48 install_add_pod/after/Pods/Pods.xcodeproj.yaml
+5 −5 install_add_pod/after/SampleApp.xcodeproj.yaml
+12 −1 install_add_pod/after/execution_output.txt
+68 −68 install_custom_build_configuration/after/Pods/Pods.xcodeproj.yaml
+10 −10 install_custom_build_configuration/after/SampleApp.xcodeproj.yaml
+8 −1 install_custom_build_configuration/after/execution_output.txt
+63 −63 install_custom_workspace/after/Pods/Pods.xcodeproj.yaml
+5 −5 install_custom_workspace/after/SampleApp_1.xcodeproj.yaml
+5 −5 install_custom_workspace/after/SampleApp_2.xcodeproj.yaml
+10 −1 install_custom_workspace/after/execution_output.txt
+33 −33 install_external_source/after/Pods/Pods.xcodeproj.yaml
+8 −8 install_external_source/after/SampleApp.xcodeproj.yaml
+16 −1 install_external_source/after/execution_output.txt
+32 −32 install_local_source/after/Pods/Pods.xcodeproj.yaml
+8 −8 install_local_source/after/SampleApp.xcodeproj.yaml
+8 −1 install_local_source/after/execution_output.txt
+110 −110 install_multiple_targets/after/Pods/Pods.xcodeproj.yaml
+15 −15 install_multiple_targets/after/SampleApp.xcodeproj.yaml
+20 −1 install_multiple_targets/after/execution_output.txt
+32 −32 install_new/after/Pods/Pods.xcodeproj.yaml
+5 −5 install_new/after/SampleApp.xcodeproj.yaml
+8 −1 install_new/after/execution_output.txt
+0 −11 install_non_objective_c_files/after/Moment.podspec
+0 −2 install_non_objective_c_files/after/Podfile
+0 −483 install_non_objective_c_files/after/Pods/Pods.xcodeproj/project.pbxproj
+0 −756 install_non_objective_c_files/after/SampleApp.xcodeproj/project.pbxproj
+32 −32 install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml
+5 −5 install_podfile_callbacks/after/SampleApp.xcodeproj.yaml
+8 −1 install_podfile_callbacks/after/execution_output.txt
+32 −32 install_podspec/after/Pods/Pods.xcodeproj.yaml
+5 −5 install_podspec/after/SampleApp.xcodeproj.yaml
+8 −1 install_podspec/after/execution_output.txt
+32 −32 install_remove_pod/after/Pods/Pods.xcodeproj.yaml
+5 −5 install_remove_pod/after/SampleApp.xcodeproj.yaml
+8 −1 install_remove_pod/after/execution_output.txt
+59 −59 install_subspecs/after/Pods/Pods.xcodeproj.yaml
+10 −10 install_subspecs/after/SampleApp.xcodeproj.yaml
+12 −1 install_subspecs/after/execution_output.txt
+33 −33 install_subspecs_no_duplicate_prefix/after/Pods/Pods.xcodeproj.yaml
+10 −10 install_subspecs_no_duplicate_prefix/after/SampleApp.xcodeproj.yaml
+12 −1 install_subspecs_no_duplicate_prefix/after/execution_output.txt
+32 −32 update_all/after/Pods/Pods.xcodeproj.yaml
+5 −5 update_all/after/SampleApp.xcodeproj.yaml
+8 −1 update_all/after/execution_output.txt
+48 −48 update_selected/after/Pods/Pods.xcodeproj.yaml
+5 −5 update_selected/after/SampleApp.xcodeproj.yaml
+12 −1 update_selected/after/execution_output.txt
2 changes: 2 additions & 0 deletions spec/integration.rb
Expand Up @@ -106,6 +106,8 @@
s.replace_path `which git`.chomp, 'GIT_BIN'
s.replace_path `which hg`.chomp, 'HG_BIN'
s.replace_user_path 'Library/Caches/CocoaPods', 'CACHES_DIR'
s.replace_path %r(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d [-+]\d{4}), '<#DATE#>'
s.replace_path %r(\(Took \d+.\d+ seconds\)), '(Took <#DURATION#> seconds)'
end

describe 'Pod install' do
Expand Down

0 comments on commit 7d99430

Please sign in to comment.