diff --git a/Gemfile b/Gemfile index 2dac66f..89f4210 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -ruby '2.0.0' +# ruby '2.0.0' gem 'rspec', '~> 3.0.0.beta2' \ No newline at end of file diff --git a/lib/deaf_grandma.rb b/lib/deaf_grandma.rb index 83ad52a..eab8704 100644 --- a/lib/deaf_grandma.rb +++ b/lib/deaf_grandma.rb @@ -17,11 +17,19 @@ def run! end end - def speak(input) #Implement your code here <<<<<<<<< - + if input.downcase == "bye" + @bye_counter += 1 + if @bye_counter == 3 + "SEE YOU LATER SONNY!" + end + elsif input != input.upcase + "SPEAK UP SONNY!" + elsif input == input.upcase + "NOT SINCE 1964!" + end end private diff --git a/lib/fizzbuzz.rb b/lib/fizzbuzz.rb index 86f9def..7b3f751 100644 --- a/lib/fizzbuzz.rb +++ b/lib/fizzbuzz.rb @@ -1,9 +1,17 @@ class SuperFizzBuzz def run(input) - #Implement your code here + if input % 3 == 0 && input % 5 == 0 + "FizzBuzz" + elsif input % 3 == 0 + "Fizz" + elsif input % 5 == 0 + "Buzz" + else + input + end end end diff --git a/spec/deaf_grandma_spec.rb b/spec/deaf_grandma_spec.rb index cf09766..ff33ae9 100644 --- a/spec/deaf_grandma_spec.rb +++ b/spec/deaf_grandma_spec.rb @@ -10,9 +10,15 @@ it "says 'NOT SINCE 1964!' when we yell" do #implement your test here + expect(script.speak("HI")).to eq "NOT SINCE 1964!" end it "EXTRA CREDIT: How would you test yelling BYE?" do #implement your test here + 2.times do + script.speak("bye") + end + + expect(script.speak("bye")).to eq "SEE YOU LATER SONNY!" end end diff --git a/spec/fizzbuzz_spec.rb b/spec/fizzbuzz_spec.rb index cfda46b..36816b6 100644 --- a/spec/fizzbuzz_spec.rb +++ b/spec/fizzbuzz_spec.rb @@ -10,13 +10,16 @@ it "returns 'Buzz' when my input is divisible by 5" do #implement your test here + expect(script.run(5)).to eq "Buzz" end it "returns 'FizzBuzz' when input is divisible by 3 & 5" do #implement your test here + expect(script.run(15)).to eq "FizzBuzz" end it "returns the input number when input isn't divisible by 3, 5, or both" do #implement your test here + expect(script.run(8)).to eq 8 end end