Commit 5283a9f4 authored by Michele's avatar Michele

External sources and sandbox analyser spec tests fixed to work with new migrator.

parent d4e53411
...@@ -56,7 +56,7 @@ module Pod ...@@ -56,7 +56,7 @@ module Pod
it "pre-downloads the Pod and stores the relevant information in the sandbox" do it "pre-downloads the Pod and stores the relevant information in the sandbox" do
sandbox = config.sandbox sandbox = config.sandbox
@external_source.send(:pre_download, sandbox) @external_source.send(:pre_download, sandbox)
path = config.sandbox.root + 'Local Podspecs/Reachability.podspec' path = config.sandbox.pod_dir('Reachability') + 'Reachability.podspec'
path.should.exist? path.should.exist?
sandbox.predownloaded_pods.should == ["Reachability"] sandbox.predownloaded_pods.should == ["Reachability"]
sandbox.checkout_sources.should == { sandbox.checkout_sources.should == {
...@@ -82,7 +82,7 @@ module Pod ...@@ -82,7 +82,7 @@ module Pod
it "creates a copy of the podspec" do it "creates a copy of the podspec" do
@external_source.fetch(config.sandbox) @external_source.fetch(config.sandbox)
path = config.sandbox.root + 'Local Podspecs/Reachability.podspec' path = config.sandbox.pod_dir('Reachability') + 'Reachability.podspec'
path.should.exist? path.should.exist?
end end
...@@ -107,7 +107,7 @@ module Pod ...@@ -107,7 +107,7 @@ module Pod
it "creates a copy of the podspec" do it "creates a copy of the podspec" do
@external_source.fetch(config.sandbox) @external_source.fetch(config.sandbox)
path = config.sandbox.root + 'Local Podspecs/SvnSource.podspec' path = config.sandbox.pod_dir('SvnSource') + 'SvnSource.podspec'
path.should.exist? path.should.exist?
end end
...@@ -132,7 +132,7 @@ module Pod ...@@ -132,7 +132,7 @@ module Pod
it "creates a copy of the podspec" do it "creates a copy of the podspec" do
@external_source.fetch(config.sandbox) @external_source.fetch(config.sandbox)
path = config.sandbox.root + 'Local Podspecs/MercurialSource.podspec' path = config.sandbox.pod_dir('MercurialSource') + 'MercurialSource.podspec'
path.should.exist? path.should.exist?
end end
...@@ -159,7 +159,7 @@ module Pod ...@@ -159,7 +159,7 @@ module Pod
it "creates a copy of the podspec" do it "creates a copy of the podspec" do
@external_source.fetch(config.sandbox) @external_source.fetch(config.sandbox)
path = config.sandbox.root + 'Local Podspecs/Reachability.podspec' path = config.sandbox.root + 'Generated/Local Podspecs/Reachability.podspec'
path.should.exist? path.should.exist?
end end
...@@ -215,7 +215,7 @@ module Pod ...@@ -215,7 +215,7 @@ module Pod
it "creates a copy of the podspec" do it "creates a copy of the podspec" do
@external_source.fetch(config.sandbox) @external_source.fetch(config.sandbox)
path = config.sandbox.root + 'Local Podspecs/Reachability.podspec' path = config.sandbox.pod_dir('Reachability') + 'Reachability.podspec'
path.should.exist? path.should.exist?
end end
...@@ -224,7 +224,7 @@ module Pod ...@@ -224,7 +224,7 @@ module Pod
podfile_path = fixture('integration/Podfile') podfile_path = fixture('integration/Podfile')
external_source = ExternalSources.from_dependency(dependency, podfile_path) external_source = ExternalSources.from_dependency(dependency, podfile_path)
external_source.fetch(config.sandbox) external_source.fetch(config.sandbox)
path = config.sandbox.root + 'Local Podspecs/Reachability.podspec' path = config.sandbox.root + 'Generated/Local Podspecs/Reachability.podspec'
path.should.exist? path.should.exist?
end end
......
...@@ -160,9 +160,9 @@ module Pod ...@@ -160,9 +160,9 @@ module Pod
#--------------------------------------# #--------------------------------------#
it "returns whether the folder containing the Pod with the given name is empty" do it "returns whether the folder containing the Pod with the given name exists" do
@analyzer.send(:folder_exist?, '\BananaLib').should.be.false @analyzer.send(:folder_exist?, 'BananaLib').should.be.false
path = temporary_directory + 'Pods/Sources/BananaLib' path = temporary_directory + 'Pods/Generated/Sources/BananaLib'
path.mkpath path.mkpath
@analyzer.send(:folder_exist?, 'BananaLib').should.be.true @analyzer.send(:folder_exist?, 'BananaLib').should.be.true
...@@ -170,7 +170,7 @@ module Pod ...@@ -170,7 +170,7 @@ module Pod
it "returns whether the folder containing the Pod with the given name is empty" do it "returns whether the folder containing the Pod with the given name is empty" do
@analyzer.send(:folder_empty?, 'BananaLib').should.be.true @analyzer.send(:folder_empty?, 'BananaLib').should.be.true
path = temporary_directory + 'Pods/Sources/BananaLib' path = temporary_directory + 'Pods/Generated/Sources/BananaLib'
path.mkpath path.mkpath
File.open(path + "file", "w") {} File.open(path + "file", "w") {}
@analyzer.send(:folder_empty?, 'BananaLib').should.be.false @analyzer.send(:folder_empty?, 'BananaLib').should.be.false
......
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