Merge pull request #6347 from CocoaPods/seg-test-2.4

[Travis] Test Ruby 2.4

.travis.yml

@@ -12,7 +12,7 @@ matrix:
     env: COCOAPODS_CI_TASKS=EXAMPLES
     osx_image: xcode7.3
     language: objective-c
-  - rvm: 2.3.1
+  - rvm: 2.4.0
     env: COCOAPODS_CI_TASKS=LINT
     git:
       submodules: false
@@ -25,7 +25,7 @@ rvm:
   # OS X 10.9.0-10.9.2
   # TODO: currently unavailable: https://github.com/travis-ci/travis-ci/issues/2918
   # - 2.0.0-p247
-  - 2.3.1
+  - 2.4.0
 
 env:
   - COCOAPODS_CI_TASKS=SPECS

Gemfile.lock

@@ -126,7 +126,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.4)
+    CFPropertyList (2.3.5)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -152,7 +152,7 @@ GEM
     colored (1.2)
     cork (0.1.0)
       colored (~> 1.2)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     danger (0.10.0)
       claide (~> 1.0)
@@ -176,6 +176,7 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
     git (1.3.0)
+    hashdiff (0.3.1)
     i18n (0.7.0)
     inch (0.7.0)
       pry
@@ -247,9 +248,10 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicode-display_width (0.3.1)
-    webmock (1.20.4)
+    webmock (2.3.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
     yard (0.8.7.6)
 
 PLATFORMS
@@ -290,4 +292,4 @@ DEPENDENCIES
   xcodeproj!
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

spec/unit/validator_spec.rb

 require File.expand_path('../../spec_helper', __FILE__)
 require 'webmock'
 
-module Bacon
-  class Context
-    alias_method :after_webmock, :after
-    def after(&block)
-      after_webmock do
-        block.call
-        WebMock.reset!
-      end
-    end
-  end
-end
-
 module Pod
   describe Validator do
+    before do
+      WebMock.enable!
+      WebMock.disable_net_connect!
+    end
+
+    after do
+      WebMock.reset!
+      WebMock.disable!
+    end
+
     before do
       Validator.any_instance.stubs(:xcodebuild).returns('')
       Validator.any_instance.stubs(:xcodebuild_available?).returns(true)