Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final Exam #10

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Gemfile.lock
13 changes: 11 additions & 2 deletions lib/vessel.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
class Vessel
attr_reader :volume
attr_reader :name, :volume

def initialize(name, volume)
def initialize(name='FAKE', volume=100)
@name = name
@volume = volume
@empty = true
end

def empty?
@empty
end

def fill
@empty = false
end

end
1 change: 1 addition & 0 deletions lib/water_dispenser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ def initialize(reservoir)
end

def dispense(vessel)
vessel.fill
reservoir.drain(vessel.volume)
end

Expand Down
10 changes: 7 additions & 3 deletions lib/water_reservoir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ def initialize(capacity = 10, initial_water_volume = 0)
end

def empty?
current_water_volume == 0
@current_water_volume == 0
end

def fill
current_water_volume = capacity
@current_water_volume = @capacity
end

def drain(volume)
self.current_water_volume -= volume
if volume > @current_water_volume
@current_water_volume = 0
else
@current_water_volume -= volume
end
end

end
14 changes: 14 additions & 0 deletions spec/item_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,18 @@

describe 'An item of food or a beverage' do

let(:item) { Item.new('FAKE', 10) }

it 'exists' do
item
end

it 'has a name' do
expect(item.name).to eq('FAKE')
end

it 'has a volume' do
expect(item.name).to eq('FAKE')
end

end
2 changes: 0 additions & 2 deletions spec/vessel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
end

it 'is initially empty' do
skip
vessel = Vessel.new('FAKE', 100)
expect(vessel).to be_empty
end

it 'is no longer empty when we fill it' do
skip
vessel = Vessel.new('FAKE', 100)
vessel.fill
expect(vessel).to_not be_empty
Expand Down
33 changes: 33 additions & 0 deletions spec/water_dispenser_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,38 @@
require_relative '../lib/water_dispenser'
require_relative '../lib/vessel'

describe 'A water dispenser' do

let(:dispenser) { WaterDispenser.new('FAKE') }

it 'exists' do
dispenser
end

it 'has a reservoir' do
expect(dispenser.reservoir).to eq('FAKE')
end

describe '#dispense' do
let(:vessel) { Vessel.new(volume=10) }

# it 'decreases the reservoir volume' do
# # vessel = double()
# # allow(vessel).to receive(:volume) { 10 }
# reservoir = double()
# allow(reservoir).to receive(:current_water_volume)
# allow(reservoir).to receive(:drain)
# remaining_volume = reservoir.current_water_volume
# expect(reservoir.drain(vessel)).to be < res
# end

# it 'fills the vessel' do
# dispenser = double()
# allow(dispenser).to receive(:reservoir) {}
# allow(dispenser).to receive(:drain)
# dispenser.drain(vessel)
# expect(vessel).to_not be_empty
# end
end

end
43 changes: 43 additions & 0 deletions spec/water_reservoir_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,47 @@

describe 'A water reservoir' do

let(:reservoir) { WaterReservoir.new(10, 0) }

it 'exists' do
reservoir
end

it 'has a capacity' do
expect(reservoir.capacity).to eq(10)
end

it 'has a current_water_volume' do
expect(reservoir.current_water_volume).to eq(0)
end

describe 'emptiness' do
before do
reservoir = WaterReservoir.new(10, 0)
end

it 'is initially empty' do
expect(reservoir).to be_empty
end

it 'has a current_water_volume equal to capacity' do
reservoir.fill
expect(reservoir.current_water_volume).to eq(reservoir.capacity)
end

it 'is no longer empty when we fill it' do
reservoir.fill
expect(reservoir).to_not be_empty
end
end

describe '#drain' do
it 'reduces volume of reservoir' do
reservoir = WaterReservoir.new(20, 10)
drain_volume = 10
remaining_volume = reservoir.current_water_volume - drain_volume
expect(reservoir.drain(drain_volume)).to eq(remaining_volume)
end
end

end