Merge pull request #146 from engineyard/bundler-1.14.6

Update to bundler 1.14.6
engineyard · May 31, 2017 · d6d95a7 · d6d95a7
2 parents 34540d2 + f752aea
commit d6d95a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/engineyard-serverside/dependency_manager/bundler.rb b/lib/engineyard-serverside/dependency_manager/bundler.rb
@@ -4,7 +4,7 @@ module EY
   module Serverside
     class DependencyManager
       class Bundler < Base
-        DEFAULT_VERSION = "1.13.6"
+        DEFAULT_VERSION = "1.14.6"
 
         def self.default_version
           DEFAULT_VERSION

diff --git a/spec-outside/lockfile_parser_spec.rb b/spec-outside/lockfile_parser_spec.rb
@@ -99,7 +99,7 @@ def get_version(file)
     end
 
     it "uses the default version when we get a pessimistic qualifier and is lower than the default version" do
-      expect(subject.fetch_version('~>', '1.13.1')).to eq(EY::Serverside::DependencyManager::Bundler.default_version)
+      expect(subject.fetch_version('~>', '1.14.1')).to eq(EY::Serverside::DependencyManager::Bundler.default_version)
     end
 
     it "uses the given version when we get a pessimistic qualifier that doesn't match the default version" do