Commit 8a8345a5 authored by Marius Rackwitz's avatar Marius Rackwitz Committed by Samuel E. Giddins

[PodSourceInstaller] Module maps are in use

parent c1dc2157
...@@ -75,6 +75,7 @@ module Pod ...@@ -75,6 +75,7 @@ module Pod
file_accessors.map(&:readme), file_accessors.map(&:readme),
file_accessors.map(&:resources), file_accessors.map(&:resources),
file_accessors.map(&:source_files), file_accessors.map(&:source_files),
file_accessors.map(&:module_map),
] ]
files.flatten.compact.map(&:to_s).uniq files.flatten.compact.map(&:to_s).uniq
......
...@@ -13,6 +13,7 @@ module Pod ...@@ -13,6 +13,7 @@ module Pod
f.include?('libPusher') || f.include?('.git') || f.include?('DS_Store') f.include?('libPusher') || f.include?('.git') || f.include?('DS_Store')
end end
expected = %w( expected = %w(
Banana.modulemap
BananaLib.podspec BananaLib.podspec
Bananalib.framework/Versions/A/Headers/Bananalib.h Bananalib.framework/Versions/A/Headers/Bananalib.h
Classes/Banana.h Classes/Banana.h
......
...@@ -34,6 +34,7 @@ module Pod ...@@ -34,6 +34,7 @@ module Pod
relative_paths = paths.map { |p| p.gsub("#{@root}/", '') } relative_paths = paths.map { |p| p.gsub("#{@root}/", '') }
relative_paths.sort.should == [ relative_paths.sort.should == [
'Banana.modulemap',
'Bananalib.framework', 'Bananalib.framework',
'Classes/Banana.h', 'Classes/Banana.h',
'Classes/Banana.m', 'Classes/Banana.m',
...@@ -63,6 +64,7 @@ module Pod ...@@ -63,6 +64,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 == [
'Banana.modulemap',
'Bananalib.framework', 'Bananalib.framework',
'Classes/Banana.h', 'Classes/Banana.h',
'Classes/Banana.m', 'Classes/Banana.m',
...@@ -79,14 +81,15 @@ module Pod ...@@ -79,14 +81,15 @@ module Pod
end end
it 'compacts the used files as nil would be converted to the empty string' do it 'compacts the used files as nil would be converted to the empty string' do
Sandbox::FileAccessor.any_instance.stubs(:source_files) Sandbox::FileAccessor.any_instance.stubs(:license)
Sandbox::FileAccessor.any_instance.stubs(:vendored_libraries) Sandbox::FileAccessor.any_instance.stubs(:module_map)
Sandbox::FileAccessor.any_instance.stubs(:resources).returns(nil)
Sandbox::FileAccessor.any_instance.stubs(:preserve_paths)
Sandbox::FileAccessor.any_instance.stubs(:prefix_header) Sandbox::FileAccessor.any_instance.stubs(:prefix_header)
Sandbox::FileAccessor.any_instance.stubs(:preserve_paths)
Sandbox::FileAccessor.any_instance.stubs(:readme) Sandbox::FileAccessor.any_instance.stubs(:readme)
Sandbox::FileAccessor.any_instance.stubs(:license) Sandbox::FileAccessor.any_instance.stubs(:resources).returns(nil)
Sandbox::FileAccessor.any_instance.stubs(:source_files)
Sandbox::FileAccessor.any_instance.stubs(:vendored_frameworks) Sandbox::FileAccessor.any_instance.stubs(:vendored_frameworks)
Sandbox::FileAccessor.any_instance.stubs(:vendored_libraries)
paths = @cleaner.send(:used_files) paths = @cleaner.send(:used_files)
paths.should == [] paths.should == []
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