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

Added test suite and changed drain behavior #8

Open
wants to merge 14 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
26 changes: 26 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
diff-lcs (1.4.4)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)

PLATFORMS
x64-mingw32

DEPENDENCIES
rspec

BUNDLED WITH
2.2.7
3 changes: 1 addition & 2 deletions lib/item.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ class Item
def initialize(name, volume)
@name = name
@volume = volume
end

end
end
16 changes: 16 additions & 0 deletions lib/vessel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ class Vessel
def initialize(name, volume)
@name = name
@volume = volume
@empty = TRUE
end

def name()
@name
end

def volume()
@volume
end

def empty?
@empty
end

def fill
@empty = FALSE
end
end
8 changes: 8 additions & 0 deletions lib/water_dispenser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ def initialize(reservoir)
end

def dispense(vessel)
#if reservoir < vessel.volume
puts('not enough water. Resevoir only has: ', reservoir)
# return
# end
reservoir.drain(vessel.volume)
end

def fill(vessel)
vessel.fill
vessel.volume = vessel.volume + reservoir
end
end
4 changes: 4 additions & 0 deletions lib/water_reservoir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ def fill
end

def drain(volume)
if self.current_water_volume < volume
puts 'Not enough water to drain.'
return
end
self.current_water_volume -= volume
end

Expand Down
4 changes: 4 additions & 0 deletions spec/freezer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@

describe 'A freezer' do


it 'exists' do
#exists
end
end
9 changes: 9 additions & 0 deletions spec/item_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,13 @@

describe 'An item of food or a beverage' do

it 'exists' do
#exists
end

it 'has a name and volume' do
item = Item.new('FAKE', 100)
expect(item.name).to eq('FAKE')
expect(item.volume).to eq(100)
end
end
13 changes: 10 additions & 3 deletions spec/vessel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,28 @@
describe 'A vessel for holding liquid' do

it 'has a name and volume' do
vessel = Vessel.new
vessel = Vessel.new('FAKE', 100)
expect(vessel.name).to eq('FAKE')
expect(vessel.volume).to eq(100)
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
end


it 'fills vessel' do
skip
dispenser= WaterDispenser.new(5)
vessel = Vessel.new('FAKE', 5)
dispenser.fill(vessel)
expect(dispenser.reservoir).to eq(10)
end
end
16 changes: 16 additions & 0 deletions spec/water_dispenser_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,20 @@

describe 'A water dispenser' do

it 'exists' do
#exists
end

it 'has a reservoir' do
dispenser= WaterDispenser.new(5)
expect(dispenser.reservoir).to eq(5)
end

it 'has 0 after dispense' do
skip
dispenser= WaterDispenser.new(5)
vessel = Vessel.new('FAKE', 5)
dispenser.dispense(vessel)
expect(dispenser.reservoir).to eq(0)
end
end
5 changes: 5 additions & 0 deletions spec/water_reservoir_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@

describe 'A water reservoir' do

it 'cannot drain passed a 0 volume' do
water_reservoir = WaterReservoir.new(10,10)
water_reservoir.drain(13)
expect(water_reservoir.current_water_volume).to eq(10)
end
end