diff --git a/minitest/navy.rb b/minitest/navy.rb index c672e0a..e1ffa24 100644 --- a/minitest/navy.rb +++ b/minitest/navy.rb @@ -1,4 +1,5 @@ class Admiral + attr_reader :battleship def initialize(battleship) @battleship = battleship end @@ -12,7 +13,7 @@ def fire_upon_target class Battleship attr_reader :ammunition def initialize - @ammunition = 100 + @ammunition = 10 end def fire! diff --git a/minitest/navy_test.rb b/minitest/navy_test.rb index de35ec0..b520ac6 100644 --- a/minitest/navy_test.rb +++ b/minitest/navy_test.rb @@ -2,7 +2,7 @@ require "minitest/autorun" require "minitest/mock" -class TestAdmiral < MiniTest::Unit::TestCase +class TestAdmiral < MiniTest::Test def setup @battleship = MiniTest::Mock.new @@ -16,7 +16,7 @@ def test_can_tell_the_battleship_to_fire end end -class TestBattleship< MiniTest::Unit::TestCase +class TestBattleship< MiniTest::Test def test_will_decrease_ammunition_when_firing battleship = Battleship.new starting_ammunition = battleship.ammunition @@ -32,4 +32,19 @@ def test_will_decrease_ammunition_when_firing battleship.fire! battleship.ammunition.must_equal (starting_ammunition -1) end + + it "should verify that starting_ammunition equals 10" do + battleship = Battleship.new + battleship.ammunition.must_equal (10) + end end + +describe Admiral do + it "should verify that Admiral has a battleship" do + battleship = Battleship.new + admiral = Admiral.new(battleship) + admiral.battleship.must_equal (battleship) + end +end + +