Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
b93205b7
Commit
b93205b7
authored
May 30, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use the same product name for test targets
parent
28ad8cd8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+1
-1
pod_target_installer_spec.rb
...xcode/pods_project_generator/pod_target_installer_spec.rb
+3
-0
No files found.
CHANGELOG.md
View file @
b93205b7
...
@@ -30,6 +30,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -30,6 +30,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
##### Bug Fixes
*
Do not use the same product name for test targets
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#6762
](
https://github.com/CocoaPods/CocoaPods/pull/6762
)
*
Use unique temp folder during lint for parallel execuition
*
Use unique temp folder during lint for parallel execuition
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#5117
](
https://github.com/CocoaPods/CocoaPods/issues/5117
)
[
#5117
](
https://github.com/CocoaPods/CocoaPods/issues/5117
)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
b93205b7
...
@@ -214,7 +214,7 @@ module Pod
...
@@ -214,7 +214,7 @@ module Pod
language
=
target
.
uses_swift?
?
:
swift
:
:objc
language
=
target
.
uses_swift?
?
:
swift
:
:objc
native_test_target
=
project
.
new_target
(
product_type
,
name
,
platform
,
deployment_target
,
nil
,
language
)
native_test_target
=
project
.
new_target
(
product_type
,
name
,
platform
,
deployment_target
,
nil
,
language
)
product_name
=
target
.
product_
name
product_name
=
name
product
=
native_test_target
.
product_reference
product
=
native_test_target
.
product_reference
product
.
name
=
product_name
product
.
name
=
product_name
...
...
spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb
View file @
b93205b7
...
@@ -187,6 +187,7 @@ module Pod
...
@@ -187,6 +187,7 @@ module Pod
@project
.
targets
.
first
.
name
.
should
==
'CoconutLib'
@project
.
targets
.
first
.
name
.
should
==
'CoconutLib'
native_test_target
=
@project
.
targets
[
1
]
native_test_target
=
@project
.
targets
[
1
]
native_test_target
.
name
.
should
==
'CoconutLib-Unit-Tests'
native_test_target
.
name
.
should
==
'CoconutLib-Unit-Tests'
native_test_target
.
product_reference
.
name
.
should
==
'CoconutLib-Unit-Tests'
native_test_target
.
symbol_type
.
should
==
:unit_test_bundle
native_test_target
.
symbol_type
.
should
==
:unit_test_bundle
@coconut_pod_target
.
test_native_targets
.
count
.
should
==
1
@coconut_pod_target
.
test_native_targets
.
count
.
should
==
1
end
end
...
@@ -225,8 +226,10 @@ module Pod
...
@@ -225,8 +226,10 @@ module Pod
@installer
.
install!
@installer
.
install!
native_target
=
@installer
.
send
(
:native_target_for_consumer
,
@coconut_spec
.
consumer
(
:ios
))
native_target
=
@installer
.
send
(
:native_target_for_consumer
,
@coconut_spec
.
consumer
(
:ios
))
native_target
.
name
.
should
==
'CoconutLib'
native_target
.
name
.
should
==
'CoconutLib'
native_target
.
product_reference
.
name
.
should
==
'libCoconutLib.a'
test_native_target
=
@installer
.
send
(
:native_target_for_consumer
,
@coconut_spec
.
test_specs
.
first
.
consumer
(
:ios
))
test_native_target
=
@installer
.
send
(
:native_target_for_consumer
,
@coconut_spec
.
test_specs
.
first
.
consumer
(
:ios
))
test_native_target
.
name
.
should
==
'CoconutLib-Unit-Tests'
test_native_target
.
name
.
should
==
'CoconutLib-Unit-Tests'
test_native_target
.
product_reference
.
name
.
should
==
'CoconutLib-Unit-Tests'
end
end
it
'returns the correct product type for test type'
do
it
'returns the correct product type for test type'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment