Merge pull request #6782 from CocoaPods/seg-fix-master

Get master green

cocoapods-integration-specs @ f576eb64

-Subproject commit a2933449730c7c103312369759fb21dbd825ec78
+Subproject commit f576eb6424bf482e5142afab357d32d1acf6ab0b

spec/functional/user_interface_spec.rb

@@ -47,7 +47,7 @@ module Pod
       output = UI.output
       output.should.include? 'Author:   Robbie Hanson'
       output.should.include? 'License:  BSD'
-      output.should.include? 'Platform: iOS 5.0 - OS X 10.7'
+      output.should.include? 'Platform: iOS 5.0 - macOS 10.7'
       output.should.include? 'Stars:    318'
       output.should.include? 'Forks:    42'
     end

spec/unit/installer/analyzer/pod_variant_set_spec.rb

@@ -31,7 +31,7 @@ module Pod
           PodVariant.new([@root_spec], Platform.ios),
           PodVariant.new([@root_spec], Platform.osx),
         ])
-        variants.scope_suffixes.values.should == %w(iOS OSX)
+        variants.scope_suffixes.values.should == %w(iOS macOS)
       end
 
       it 'returns scopes by versioned platform names if they qualify' do
@@ -94,7 +94,7 @@ module Pod
         ])
         variants.scope_suffixes.values.should == %w(
           iOS
-          OSX
+          macOS
           .default-Foo
           .default-Bar
         )
@@ -110,7 +110,7 @@ module Pod
         ])
         variants.scope_suffixes.values.should == %w(
           iOS
-          OSX
+          macOS
           c4ca5113
           .default-matryoshka_ThisIsAReallyLongSubspecName
         )
@@ -128,9 +128,9 @@ module Pod
         variants.scope_suffixes.values.should == %w(
           iOS7.0
           iOS
-          OSX
+          macOS
           .default-Foo-iOS
-          .default-Foo-OSX
+          .default-Foo-macOS
           .default-Bar
         )
       end

spec/unit/installer/analyzer_spec.rb

@@ -276,7 +276,7 @@ module Pod
           Hash[pod_targets.map { |t| [t.label, t.target_definitions.map(&:label).sort] }.sort].should == {
             'BananaLib'  => %w(Pods-SampleProject Pods-SampleProject-TestRunner),
             'monkey-iOS' => %w(Pods-SampleProject Pods-SampleProject-TestRunner),
-            'monkey-OSX' => %w(Pods-CLITool),
+            'monkey-macOS' => %w(Pods-CLITool),
           }
         end
 

spec/unit/sources_manager_spec.rb

@@ -84,7 +84,7 @@ module Pod
       extend SpecHelper::TemporaryRepos
 
       before do
-        MasterSource.any_instance.stubs(:requires_update?).returns(true)
+        MasterSource.any_instance.stubs(:unchanged_github_repo?).returns(false)
       end
 
       it 'updates source backed by a git repository' do