From bdedf600adc2d0ad8ea4dfb63e3ba38771d9a808 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:27:55 -0700 Subject: [PATCH 01/13] added default name and volume to parameter list in vessel.rb --- lib/vessel.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vessel.rb b/lib/vessel.rb index 6849edf..cdde754 100644 --- a/lib/vessel.rb +++ b/lib/vessel.rb @@ -1,7 +1,7 @@ class Vessel - attr_reader :volume + attr_reader :volume, :name - def initialize(name, volume) + def initialize(name = "FAKE", volume = 100) @name = name @volume = volume end From 0ee69230e668c4e654e449418896d793b3c4445e Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:35:09 -0700 Subject: [PATCH 02/13] added empty? method and fill method to vessel.rb --- lib/vessel.rb | 11 ++++++++++- spec/vessel_spec.rb | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/vessel.rb b/lib/vessel.rb index cdde754..f625510 100644 --- a/lib/vessel.rb +++ b/lib/vessel.rb @@ -1,9 +1,18 @@ class Vessel - attr_reader :volume, :name + attr_reader :volume, :name, :empty def initialize(name = "FAKE", volume = 100) @name = name @volume = volume + @empty = true + end + + def empty? + @empty + end + + def fill + @empty = false end end diff --git a/spec/vessel_spec.rb b/spec/vessel_spec.rb index 3a6c301..f956f42 100644 --- a/spec/vessel_spec.rb +++ b/spec/vessel_spec.rb @@ -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 From ba7bbd7cfae34b307bc8862c5b8abe54f351f4a7 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:42:34 -0700 Subject: [PATCH 03/13] added attribute test for name in item_spec.rb --- spec/item_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/item_spec.rb b/spec/item_spec.rb index caeefe4..8e7f1b5 100644 --- a/spec/item_spec.rb +++ b/spec/item_spec.rb @@ -1,5 +1,10 @@ require_relative '../lib/item' describe 'An item of food or a beverage' do + item = Item.new("Fake", 100) + + it 'has a name' do + expect(item).to respond_to(:name) + end end From c267e83ebb932018bb30261fe8a9c4e9b8b591b4 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:44:04 -0700 Subject: [PATCH 04/13] added attribute test for volume in item_spec.rb --- spec/item_spec.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spec/item_spec.rb b/spec/item_spec.rb index 8e7f1b5..0ca14fe 100644 --- a/spec/item_spec.rb +++ b/spec/item_spec.rb @@ -1,10 +1,14 @@ require_relative '../lib/item' describe 'An item of food or a beverage' do - item = Item.new("Fake", 100) + item = Item.new("Fake", 100) - it 'has a name' do - expect(item).to respond_to(:name) - 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 From b7d3db7aaad36fe1250df35f138c7d8658510a59 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:46:43 -0700 Subject: [PATCH 05/13] added instantiation test to item_spec.rb --- spec/item_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/item_spec.rb b/spec/item_spec.rb index 0ca14fe..1360b8b 100644 --- a/spec/item_spec.rb +++ b/spec/item_spec.rb @@ -3,6 +3,10 @@ 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 From c1d26d5bf3e8333cbcb9434122db0a4d7bbc59cb Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:48:29 -0700 Subject: [PATCH 06/13] added instantiation test to water_dispenser.rb --- spec/water_dispenser_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/water_dispenser_spec.rb b/spec/water_dispenser_spec.rb index 526e3d9..f6b3a77 100644 --- a/spec/water_dispenser_spec.rb +++ b/spec/water_dispenser_spec.rb @@ -1,5 +1,8 @@ require_relative '../lib/water_dispenser' describe 'A water dispenser' do + it 'exists' do + WaterDispenser.new("FAKE") + end end From 2b52426493fa838a23b11b7bffaa1e4745c3f8c6 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:51:24 -0700 Subject: [PATCH 07/13] added attribute test for reservoir in water_sipenser_spec.rb --- spec/water_dispenser_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/water_dispenser_spec.rb b/spec/water_dispenser_spec.rb index f6b3a77..0aadb7d 100644 --- a/spec/water_dispenser_spec.rb +++ b/spec/water_dispenser_spec.rb @@ -1,8 +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 From b2ee77797190a5cf11a5a2140577bdf67464cd60 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 11:54:55 -0700 Subject: [PATCH 08/13] added if statement to drain method so water volume cannot go negative in water_reservoir --- lib/water_reservoir.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/water_reservoir.rb b/lib/water_reservoir.rb index b314707..cf27a8b 100644 --- a/lib/water_reservoir.rb +++ b/lib/water_reservoir.rb @@ -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 From d4f616eda68de48e91053f8a1485a5fdeb254c52 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 12:02:06 -0700 Subject: [PATCH 09/13] added instantiation test to water_resivoir_spec --- spec/water_reservoir_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/water_reservoir_spec.rb b/spec/water_reservoir_spec.rb index 059a885..111a806 100644 --- a/spec/water_reservoir_spec.rb +++ b/spec/water_reservoir_spec.rb @@ -1,5 +1,7 @@ require_relative '../lib/water_reservoir' describe 'A water reservoir' do - + it 'exists' do + WaterReservoir.new + end end From 74d1abf783897609590d1eb9861624ff1aff7ed1 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 12:03:51 -0700 Subject: [PATCH 10/13] added attribute test for capacity to water_resivoir_spec --- spec/water_reservoir_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/water_reservoir_spec.rb b/spec/water_reservoir_spec.rb index 111a806..1151cd1 100644 --- a/spec/water_reservoir_spec.rb +++ b/spec/water_reservoir_spec.rb @@ -1,7 +1,13 @@ 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 end From fde8f3e2b4731cd885be38b91420fd155b931d9b Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 12:05:32 -0700 Subject: [PATCH 11/13] added attribute test for current_water_volume to water_resivoir_spec --- spec/water_reservoir_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/water_reservoir_spec.rb b/spec/water_reservoir_spec.rb index 1151cd1..ed9ed1a 100644 --- a/spec/water_reservoir_spec.rb +++ b/spec/water_reservoir_spec.rb @@ -10,4 +10,8 @@ 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 end From 5561df098af904dd821ff5436f35f910bbe887e0 Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 12:07:22 -0700 Subject: [PATCH 12/13] added test for empty method to water_resivoir_spec --- spec/water_reservoir_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/water_reservoir_spec.rb b/spec/water_reservoir_spec.rb index ed9ed1a..6fcc72f 100644 --- a/spec/water_reservoir_spec.rb +++ b/spec/water_reservoir_spec.rb @@ -14,4 +14,8 @@ 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 end From 245aa74ae950a790adef197789d45df31e2004fc Mon Sep 17 00:00:00 2001 From: Adrianna Gilmore Date: Thu, 18 Mar 2021 12:10:27 -0700 Subject: [PATCH 13/13] added test for fill method to water_resivoir_spec --- spec/water_reservoir_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/water_reservoir_spec.rb b/spec/water_reservoir_spec.rb index 6fcc72f..c8bc2d1 100644 --- a/spec/water_reservoir_spec.rb +++ b/spec/water_reservoir_spec.rb @@ -18,4 +18,8 @@ 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