Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Fix DepProxy == method #6669

Merged
merged 2 commits into from
Aug 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/bundler/dep_proxy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ def initialize(dep, platform)
end

def hash
@hash ||= dep.hash
@hash ||= [dep, __platform].hash
end

def ==(other)
return if other.nil?
return false if other.class != self.class
dep == other.dep && __platform == other.__platform
end

Expand Down
22 changes: 22 additions & 0 deletions spec/bundler/dep_proxy_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# frozen_string_literal: true

RSpec.describe Bundler::DepProxy do
let(:dep) { Bundler::Dependency.new("rake", ">= 0") }
subject { described_class.new(dep, Gem::Platform::RUBY) }
let(:same) { subject }
let(:other) { subject.dup }
let(:different) { described_class.new(dep, Gem::Platform::JAVA) }

describe "#eql?" do
it { expect(subject.eql?(same)).to be true }
it { expect(subject.eql?(other)).to be true }
it { expect(subject.eql?(different)).to be false }
it { expect(subject.eql?(nil)).to be false }
it { expect(subject.eql?("foobar")).to be false }
end

describe "#hash" do
it { expect(subject.hash).to eq(same.hash) }
it { expect(subject.hash).to eq(other.hash) }
end
end