Merge pull request #7630 from CocoaPods/segiddins/fix-test-only-multi-target

Fix determining whether specs are test-only when there are multiple target definitions

lib/cocoapods/resolver.rb

@@ -134,12 +134,15 @@ module Pod
     def resolver_specs_by_target
       @resolver_specs_by_target ||= {}.tap do |resolver_specs_by_target|
         @podfile_dependency_cache.target_definition_list.each do |target|
+          # can't use vertex.root? since that considers _all_ targets
+          explicit_dependencies = @podfile_dependency_cache.target_definition_dependencies(target).map(&:name).to_set
           vertices = valid_dependencies_for_target(target)
 
           resolver_specs_by_target[target] = vertices.
             map do |vertex|
               payload = vertex.payload
-              test_only = (!vertex.root? || payload.test_specification?) && vertex.recursive_predecessors.all? { |v| !v.root? || v.payload.test_specification? }
+              test_only = (!explicit_dependencies.include?(vertex.name) || payload.test_specification?) &&
+                (vertex.recursive_predecessors & vertices).all? { |v| !explicit_dependencies.include?(v.name) || v.payload.test_specification? }
               spec_source = payload.respond_to?(:spec_source) && payload.spec_source
               ResolverSpecification.new(payload, test_only, spec_source)
             end.

spec/unit/resolver_spec.rb

@@ -475,6 +475,50 @@ module Pod
         resolved_specs.find { |rs| rs.name == 'MainSpec/Tests' }.should.be.used_by_tests_only
       end
 
+      it 'handles test only dependencies when they are also used in a different target' do
+        @podfile = Podfile.new do
+          platform :ios, '10'
+
+          target 'A' do
+            pod 'MainSpec', :git => 'GIT-URL', :testspecs => ['Tests']
+          end
+
+          target 'B' do
+            pod 'Expecta'
+            pod 'OCMock'
+          end
+        end
+        spec = Spec.new do |s|
+          s.name         = 'MainSpec'
+          s.version      = '1.2.3'
+          s.platform     = :ios
+          s.dependency 'Expecta'
+
+          s.test_spec 'Tests' do |tss|
+            tss.source_files = 'some/file'
+            tss.dependency 'Expecta'
+            tss.dependency 'OCMock'
+          end
+        end
+        config.sandbox.expects(:specification).with('MainSpec').returns(spec)
+        resolver = create_resolver
+        resolved_specs = resolver.resolve
+
+        a_specs = resolved_specs[@podfile.target_definitions['A']]
+        b_specs = resolved_specs[@podfile.target_definitions['B']]
+
+        a_specs.map(&:name).sort.should == %w(Expecta MainSpec MainSpec/Tests OCMock)
+        b_specs.map(&:name).sort.should == %w(Expecta OCMock)
+
+        a_specs.find { |rs| rs.name == 'Expecta' }.should.not.be.used_by_tests_only
+        a_specs.find { |rs| rs.name == 'MainSpec' }.should.not.be.used_by_tests_only
+        a_specs.find { |rs| rs.name == 'MainSpec/Tests' }.should.be.used_by_tests_only
+        a_specs.find { |rs| rs.name == 'OCMock' }.should.be.used_by_tests_only
+
+        b_specs.find { |rs| rs.name == 'Expecta' }.should.not.be.used_by_tests_only
+        b_specs.find { |rs| rs.name == 'OCMock' }.should.not.be.used_by_tests_only
+      end
+
       it 'allows pre-release spec versions when a requirement has an ' \
          'external source' do
         @podfile = Podfile.new do