Commit 8d91ea79 authored by Fabio Pelosin's avatar Fabio Pelosin

[Project] Minor clean up

parent 3ed1918d
...@@ -4,7 +4,7 @@ module Pod ...@@ -4,7 +4,7 @@ module Pod
describe Project do describe Project do
before do before do
@project = Project.new(config.sandbox.project_path) @sut = Project.new(config.sandbox.project_path)
end end
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
...@@ -12,30 +12,30 @@ module Pod ...@@ -12,30 +12,30 @@ module Pod
describe "In general" do describe "In general" do
it "returns the support files group" do it "returns the support files group" do
@project.support_files_group.name.should == 'Targets Support Files' @sut.support_files_group.name.should == 'Targets Support Files'
end end
it "returns the pods group" do it "returns the pods group" do
@project.pods.name.should == 'Pods' @sut.pods.name.should == 'Pods'
end end
it "returns development Pods group" do it "returns development Pods group" do
@project.development_pods.name.should == 'Development Pods' @sut.development_pods.name.should == 'Development Pods'
end end
describe "#prepare_for_serialization" do describe "#prepare_for_serialization" do
it "deletes the Pod and the Development Pods groups if empty" do it "deletes the Pod and the Development Pods groups if empty" do
@project.prepare_for_serialization @sut.prepare_for_serialization
@project[Project::ROOT_GROUPS[:pods]].should.be.nil @sut[Project::ROOT_GROUPS[:pods]].should.be.nil
@project[Project::ROOT_GROUPS[:development_pods]].should.be.nil @sut[Project::ROOT_GROUPS[:development_pods]].should.be.nil
end end
it "sorts the groups recursively" do it "sorts the groups recursively" do
@project.pods.new_group('group_2') @sut.pods.new_group('group_2')
@project.pods.new_group('group_1') @sut.pods.new_group('group_1')
@project.prepare_for_serialization @sut.prepare_for_serialization
@project.pods.children.map(&:name).should == ["group_1", "group_2"] @sut.pods.children.map(&:name).should == ["group_1", "group_2"]
end end
end end
end end
...@@ -51,21 +51,21 @@ module Pod ...@@ -51,21 +51,21 @@ module Pod
end end
it "adds the group for a Pod" do it "adds the group for a Pod" do
group = @project.add_pod_group('BananaLib', @path) group = @sut.add_pod_group('BananaLib', @path)
group.parent.should == @project.pods group.parent.should == @sut.pods
group.name.should == 'BananaLib' group.name.should == 'BananaLib'
end end
it "adds the group for a development Pod" do it "adds the group for a development Pod" do
path = config.sandbox.pod_dir('BananaLib') path = config.sandbox.pod_dir('BananaLib')
group = @project.add_pod_group('BananaLib', @path, true) group = @sut.add_pod_group('BananaLib', @path, true)
group.parent.should == @project.development_pods group.parent.should == @sut.development_pods
group.name.should == 'BananaLib' group.name.should == 'BananaLib'
end end
it "configures the path of a new Pod group" do it "configures the path of a new Pod group" do
path = config.sandbox.pod_dir('BananaLib') path = config.sandbox.pod_dir('BananaLib')
group = @project.add_pod_group('BananaLib', @path) group = @sut.add_pod_group('BananaLib', @path)
group.source_tree.should == '<group>' group.source_tree.should == '<group>'
group.path.should == 'BananaLib' group.path.should == 'BananaLib'
Pathname.new(group.path).should.be.relative Pathname.new(group.path).should.be.relative
...@@ -73,14 +73,14 @@ module Pod ...@@ -73,14 +73,14 @@ module Pod
it "configures the path of a new Pod group as absolute if requested" do it "configures the path of a new Pod group as absolute if requested" do
path = config.sandbox.pod_dir('BananaLib') path = config.sandbox.pod_dir('BananaLib')
group = @project.add_pod_group('BananaLib', @path, false, true) group = @sut.add_pod_group('BananaLib', @path, false, true)
group.source_tree.should == '<absolute>' group.source_tree.should == '<absolute>'
group.path.should == @path.to_s group.path.should == @path.to_s
Pathname.new(group.path).should.be.absolute Pathname.new(group.path).should.be.absolute
end end
it "creates a support file group relative to the project" do it "creates a support file group relative to the project" do
group = @project.add_pod_group('BananaLib', @path, false, true) group = @sut.add_pod_group('BananaLib', @path, false, true)
group['Support Files'].source_tree.should == 'SOURCE_ROOT' group['Support Files'].source_tree.should == 'SOURCE_ROOT'
group['Support Files'].path.should.be.nil group['Support Files'].path.should.be.nil
end end
...@@ -91,17 +91,17 @@ module Pod ...@@ -91,17 +91,17 @@ module Pod
describe "#pod_groups" do describe "#pod_groups" do
before do before do
@project.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib')) @sut.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'))
@project.add_pod_group('OrangeLib', config.sandbox.pod_dir('OrangeLib'), true) @sut.add_pod_group('OrangeLib', config.sandbox.pod_dir('OrangeLib'), true)
end end
it "returns the pod groups" do it "returns the pod groups" do
@project.pod_groups.map(&:name).sort.should == ["BananaLib", "OrangeLib"] @sut.pod_groups.map(&:name).sort.should == ["BananaLib", "OrangeLib"]
end end
it "doesn't alters the original groups" do it "doesn't alters the original groups" do
@project.pods.children.map(&:name).sort.should == ["BananaLib"] @sut.pods.children.map(&:name).sort.should == ["BananaLib"]
@project.development_pods.children.map(&:name).sort.should == ["OrangeLib"] @sut.development_pods.children.map(&:name).sort.should == ["OrangeLib"]
end end
end end
...@@ -109,8 +109,8 @@ module Pod ...@@ -109,8 +109,8 @@ module Pod
#----------------------------------------# #----------------------------------------#
it "returns the group of a Pod with a given name" do it "returns the group of a Pod with a given name" do
@project.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib')) @sut.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'))
@project.pod_group('BananaLib').name.should == 'BananaLib' @sut.pod_group('BananaLib').name.should == 'BananaLib'
end end
#----------------------------------------# #----------------------------------------#
...@@ -118,28 +118,28 @@ module Pod ...@@ -118,28 +118,28 @@ module Pod
describe "#group_for_spec" do describe "#group_for_spec" do
before do before do
@project.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib')) @sut.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'))
end end
it "returns the group for the spec with the given name" do it "returns the group for the spec with the given name" do
group = @project.group_for_spec('BananaLib/Tree') group = @sut.group_for_spec('BananaLib/Tree')
group.hierarchy_path.should == '/Pods/BananaLib/Subspecs/Tree' group.hierarchy_path.should == '/Pods/BananaLib/Subspecs/Tree'
end end
it "returns the requested subgroup" do it "returns the requested subgroup" do
group = @project.group_for_spec('BananaLib/Tree', :source_files) group = @sut.group_for_spec('BananaLib/Tree', :source_files)
group.hierarchy_path.should == '/Pods/BananaLib/Subspecs/Tree/Source Files' group.hierarchy_path.should == '/Pods/BananaLib/Subspecs/Tree/Source Files'
end end
it "raises if unable to recognize the subgroup key" do it "raises if unable to recognize the subgroup key" do
should.raise ArgumentError do should.raise ArgumentError do
@project.group_for_spec('BananaLib/Tree', :unknown) @sut.group_for_spec('BananaLib/Tree', :unknown)
end.message.should.match /Unrecognized subgroup/ end.message.should.match /Unrecognized subgroup/
end end
it "doesn't duplicate the groups" do it "doesn't duplicate the groups" do
group_1 = @project.group_for_spec('BananaLib/Tree', :source_files) group_1 = @sut.group_for_spec('BananaLib/Tree', :source_files)
group_2 = @project.group_for_spec('BananaLib/Tree', :source_files) group_2 = @sut.group_for_spec('BananaLib/Tree', :source_files)
group_1.uuid.should == group_2.uuid group_1.uuid.should == group_2.uuid
end end
end end
...@@ -152,26 +152,26 @@ module Pod ...@@ -152,26 +152,26 @@ module Pod
describe "#reference_for_path" do describe "#reference_for_path" do
before do before do
@project.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'), false) @sut.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'), false)
@file = config.sandbox.pod_dir('BananaLib') + "file.m" @file = config.sandbox.pod_dir('BananaLib') + "file.m"
@group = @project.group_for_spec('BananaLib', :source_files) @group = @sut.group_for_spec('BananaLib', :source_files)
end end
it "adds a file references to the given file" do it "adds a file references to the given file" do
ref = @project.add_file_reference(@file, @group) ref = @sut.add_file_reference(@file, @group)
ref.hierarchy_path.should == '/Pods/BananaLib/Source Files/file.m' ref.hierarchy_path.should == '/Pods/BananaLib/Source Files/file.m'
end end
it "it doesn't duplicate file references for a single path" do it "it doesn't duplicate file references for a single path" do
ref_1 = @project.add_file_reference(@file, @group) ref_1 = @sut.add_file_reference(@file, @group)
ref_2 = @project.add_file_reference(@file, @group) ref_2 = @sut.add_file_reference(@file, @group)
ref_1.uuid.should == ref_2.uuid ref_1.uuid.should == ref_2.uuid
@group.children.count.should == 1 @group.children.count.should == 1
end end
it "raises if the given path is not absolute" do it "raises if the given path is not absolute" do
should.raise ArgumentError do should.raise ArgumentError do
@project.add_file_reference('relative/path/to/file.m', @group) @sut.add_file_reference('relative/path/to/file.m', @group)
end.message.should.match /Paths must be absolute/ end.message.should.match /Paths must be absolute/
end end
...@@ -182,26 +182,26 @@ module Pod ...@@ -182,26 +182,26 @@ module Pod
describe "#reference_for_path" do describe "#reference_for_path" do
before do before do
@project.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'), false) @sut.add_pod_group('BananaLib', config.sandbox.pod_dir('BananaLib'), false)
@file = config.sandbox.pod_dir('BananaLib') + "file.m" @file = config.sandbox.pod_dir('BananaLib') + "file.m"
@group = @project.group_for_spec('BananaLib', :source_files) @group = @sut.group_for_spec('BananaLib', :source_files)
@project.add_file_reference(@file, @group) @sut.add_file_reference(@file, @group)
end end
it "returns the reference for the given path" do it "returns the reference for the given path" do
ref = @project.reference_for_path(@file) ref = @sut.reference_for_path(@file)
ref.hierarchy_path.should == '/Pods/BananaLib/Source Files/file.m' ref.hierarchy_path.should == '/Pods/BananaLib/Source Files/file.m'
end end
it "returns nil if no reference for the given path is available" do it "returns nil if no reference for the given path is available" do
another_file = config.sandbox.pod_dir('BananaLib') + "another_file.m" another_file = config.sandbox.pod_dir('BananaLib') + "another_file.m"
ref = @project.reference_for_path(another_file) ref = @sut.reference_for_path(another_file)
ref.should.be.nil ref.should.be.nil
end end
it "raises if the given path is not absolute" do it "raises if the given path is not absolute" do
should.raise ArgumentError do should.raise ArgumentError do
@project.reference_for_path('relative/path/to/file.m') @sut.reference_for_path('relative/path/to/file.m')
end.message.should.match /Paths must be absolute/ end.message.should.match /Paths must be absolute/
end end
...@@ -210,16 +210,16 @@ module Pod ...@@ -210,16 +210,16 @@ module Pod
#----------------------------------------# #----------------------------------------#
it "adds the Podfile configured as a Ruby file" do it "adds the Podfile configured as a Ruby file" do
@project.add_podfile(config.sandbox.root + '../Podfile') @sut.add_podfile(config.sandbox.root + '../Podfile')
f = @project['Podfile'] f = @sut['Podfile']
f.source_tree.should == 'SOURCE_ROOT' f.source_tree.should == 'SOURCE_ROOT'
f.xc_language_specification_identifier.should == 'xcode.lang.ruby' f.xc_language_specification_identifier.should == 'xcode.lang.ruby'
f.path.should == '../Podfile' f.path.should == '../Podfile'
end end
it "returns the file reference of the Podfile" do it "returns the file reference of the Podfile" do
ref = @project.add_podfile(config.sandbox.root + '../Podfile') ref = @sut.add_podfile(config.sandbox.root + '../Podfile')
@project.podfile.should.equal(ref) @sut.podfile.should.equal(ref)
end end
end end
...@@ -231,18 +231,18 @@ module Pod ...@@ -231,18 +231,18 @@ module Pod
describe "#create_group_if_needed" do describe "#create_group_if_needed" do
it "creates a new group" do it "creates a new group" do
group = @project.send(:create_group_if_needed, 'Group') group = @sut.send(:create_group_if_needed, 'Group')
group.hierarchy_path.should == '/Group' group.hierarchy_path.should == '/Group'
end end
it "creates a new group" do it "creates a new group" do
group = @project.send(:create_group_if_needed, 'Group', @project.pods) group = @sut.send(:create_group_if_needed, 'Group', @sut.pods)
group.hierarchy_path.should == '/Pods/Group' group.hierarchy_path.should == '/Pods/Group'
end end
it "returns an already existing group" do it "returns an already existing group" do
group_1 = @project.send(:create_group_if_needed, 'Group') group_1 = @sut.send(:create_group_if_needed, 'Group')
group_2 = @project.send(:create_group_if_needed, 'Group') group_2 = @sut.send(:create_group_if_needed, 'Group')
group_1.should.be.equal(group_2) group_1.should.be.equal(group_2)
end end
...@@ -253,16 +253,16 @@ module Pod ...@@ -253,16 +253,16 @@ module Pod
describe "#spec_group" do describe "#spec_group" do
before do before do
@project.add_pod_group('JSONKit', config.sandbox.pod_dir('JSONKit')) @sut.add_pod_group('JSONKit', config.sandbox.pod_dir('JSONKit'))
end end
it "returns the Pod group for root specifications" do it "returns the Pod group for root specifications" do
group = @project.send(:spec_group, 'JSONKit') group = @sut.send(:spec_group, 'JSONKit')
group.hierarchy_path.should == '/Pods/JSONKit' group.hierarchy_path.should == '/Pods/JSONKit'
end end
it "returns the group for subspecs" do it "returns the group for subspecs" do
group = @project.send(:spec_group, 'JSONKit/Parsing') group = @sut.send(:spec_group, 'JSONKit/Parsing')
group.hierarchy_path.should == '/Pods/JSONKit/Subspecs/Parsing' group.hierarchy_path.should == '/Pods/JSONKit/Subspecs/Parsing'
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