Commit 0117fd9b authored by Marius Rackwitz's avatar Marius Rackwitz Committed by Samuel E. Giddins

[Spec] Fix PodSourceInstallerSpec after updating fixture podspec

parent f47e54e4
...@@ -25,7 +25,7 @@ module Pod ...@@ -25,7 +25,7 @@ module Pod
config.sandbox.store_head_pod('BananaLib') config.sandbox.store_head_pod('BananaLib')
@spec.source = { :git => SpecHelper.fixture('banana-lib'), :tag => 'v1.0' } @spec.source = { :git => SpecHelper.fixture('banana-lib'), :tag => 'v1.0' }
@installer.install! @installer.install!
@installer.specific_source[:commit].should == '0b8b4084a43c38cfe308efa076fdeb3a64d9d2bc' @installer.specific_source[:commit].should == '9c7802033af588bed9dd5cb089bc8998a65bbd29'
pod_folder = config.sandbox.pod_dir('BananaLib') pod_folder = config.sandbox.pod_dir('BananaLib')
pod_folder.should.exist pod_folder.should.exist
end end
...@@ -45,7 +45,7 @@ module Pod ...@@ -45,7 +45,7 @@ module Pod
sources = @installer.sandbox.checkout_sources sources = @installer.sandbox.checkout_sources
sources.should == { 'BananaLib' => { sources.should == { 'BananaLib' => {
:git => SpecHelper.fixture('banana-lib'), :git => SpecHelper.fixture('banana-lib'),
:commit => '0b8b4084a43c38cfe308efa076fdeb3a64d9d2bc' }, :commit => '9c7802033af588bed9dd5cb089bc8998a65bbd29' },
} }
end end
......
...@@ -32,19 +32,26 @@ module Pod ...@@ -32,19 +32,26 @@ module Pod
it 'returns the used files' do it 'returns the used files' do
paths = @cleaner.send(:used_files) paths = @cleaner.send(:used_files)
relative_paths = paths.map { |p| p.gsub("#{@root}/", '') } relative_paths = paths.map { |p| p.gsub("#{@root}/", '') }
relative_paths.sort.should == [ relative_paths.sort.should == [
'Bananalib.framework',
'Classes/Banana.h', 'Classes/Banana.h',
'Classes/Banana.m', 'Classes/Banana.m',
'Classes/BananaLib.pch', 'Classes/BananaLib.pch',
'Classes/BananaPrivate.h', 'Classes/BananaPrivate.h',
'Classes/BananaTrace.d',
'LICENSE', 'LICENSE',
'README', 'README',
'Resources/logo-sidebar.png', 'Resources/logo-sidebar.png',
'Resources/sub_dir',
'libBananalib.a',
'preserve_me.txt',
] ]
end end
it 'handles Pods with multiple file accessors' do it 'handles Pods with multiple file accessors' do
spec = fixture_spec('banana-lib/BananaLib.podspec') spec = fixture_spec('banana-lib/BananaLib.podspec')
spec.source = { :git => SpecHelper.fixture('banana-lib') }
spec.source_files = [] spec.source_files = []
spec.ios.source_files = 'Classes/*.h' spec.ios.source_files = 'Classes/*.h'
spec.osx.source_files = 'Classes/*.m' spec.osx.source_files = 'Classes/*.m'
...@@ -55,6 +62,7 @@ module Pod ...@@ -55,6 +62,7 @@ module Pod
paths = @cleaner.send(:used_files) paths = @cleaner.send(:used_files)
relative_paths = paths.map { |p| p.gsub("#{@root}/", '') } relative_paths = paths.map { |p| p.gsub("#{@root}/", '') }
relative_paths.sort.should == [ relative_paths.sort.should == [
'Bananalib.framework',
'Classes/Banana.h', 'Classes/Banana.h',
'Classes/Banana.m', 'Classes/Banana.m',
'Classes/BananaLib.pch', 'Classes/BananaLib.pch',
...@@ -62,6 +70,9 @@ module Pod ...@@ -62,6 +70,9 @@ module Pod
'LICENSE', 'LICENSE',
'README', 'README',
'Resources/logo-sidebar.png', 'Resources/logo-sidebar.png',
'Resources/sub_dir',
'libBananalib.a',
'preserve_me.txt',
] ]
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