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

Adrianna Gilmore | CS 362 | Final Exam Part 2 #4

Open
wants to merge 13 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
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 :volume, :name, :empty

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
4 changes: 3 additions & 1 deletion lib/water_reservoir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ def fill
end

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

end
13 changes: 13 additions & 0 deletions spec/item_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
require_relative '../lib/item'

describe 'An item of food or a beverage' do
item = Item.new("Fake", 100)

it 'exists' do
Item.new("Fake", 100)
end

it 'has a name' do
expect(item).to respond_to(:name)
end

it 'has a volume' do
expect(item).to respond_to(:volume)
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
9 changes: 9 additions & 0 deletions spec/water_dispenser_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
require_relative '../lib/water_dispenser'

describe 'A water dispenser' do
water_dispenser = WaterDispenser.new("FAKE")

it 'exists' do
WaterDispenser.new("FAKE")
end

it 'has a reservoir' do
expect(water_dispenser).to respond_to(:reservoir)
end

end
20 changes: 20 additions & 0 deletions spec/water_reservoir_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
require_relative '../lib/water_reservoir'

describe 'A water reservoir' do
water_reservoir = WaterReservoir.new

it 'exists' do
WaterReservoir.new
end

it 'has a capacity' do
expect(water_reservoir).to respond_to(:capacity)
end

it 'has a current_water_volume' do
expect(water_reservoir).to respond_to(:current_water_volume)
end

it 'expects current_water_volume to be initialized to empty' do
expect(water_reservoir).to be_empty
end

it 'expects fill to return the capacity' do
expect(water_reservoir.fill).to eq(10)
end
end