bundler 1.17

kontena · Dec 17, 2019 · a0b8b01 · a0b8b01
1 parent 781b307
commit a0b8b01
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,8 @@ rvm:
   - 2.5
   - 2.6
 cache: bundler
+before_install:
+  - # we want bundler 1.7 (for now) https://docs.travis-ci.com/user/languages/ruby/
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 script: bundle install && bundle exec rspec spec/
diff --git a/kong.gemspec b/kong.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_runtime_dependency "excon"
 end
diff --git a/lib/kong/belongs_to_consumer.rb b/lib/kong/belongs_to_consumer.rb
@@ -13,9 +13,8 @@ def consumer
       if @consumer
         return @consumer
       elsif self.attributes['consumer'] && self.attributes['consumer'].instance_of?(Hash)
-        @consumer = Consumer.new(attributes['consumer'])
-        return @consumer
-      elsif self.attributes['consumer'] && self..attributes['consumer'].instance_of?(Kong::Consumer)
+        return @consumer = Consumer.new(attributes['consumer'])
+      elsif self.attributes['consumer'] && self.attributes['consumer'].instance_of?(Kong::Consumer)
         @consumer = self.attributes['consumer']
         return @consumer
       end