Impemented spec

ludo · Sep 23, 2011 · 2be34f6 · 2be34f6
1 parent d502476
commit 2be34f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/lib/elderly_discount_calculator.rb b/lib/elderly_discount_calculator.rb
@@ -20,8 +20,8 @@ def initialize(income, age, single)
   #
   # @return [Fixnum] Discount
   def discount
-    # TODO Exercise 1: Implement this method by making tests pass, try to incrementally implement the method. Choose one test and write just enough code to make it pass, then move on to the next test.
-    raise NotImplementedError
+    return 0 if @age < 65 || @income > ELDERLY_DISCOUNT_MAXIMUM_INCOME
+    @single ? ELDERLY_DISCOUNT_SINGLE : ELDERLY_DISCOUNT
   end
 
   # Find out if a person is eligible for elderly discount, based on input

diff --git a/spec/elderly_discount_calculator_spec.rb b/spec/elderly_discount_calculator_spec.rb
@@ -27,7 +27,6 @@ def calculator(attrs={})
           end
 
           it "should receive elderly discount for single person" do
-            pending
             calculator(@attrs).discount.should == ElderlyDiscountCalculator::ELDERLY_DISCOUNT_SINGLE
           end
         end
@@ -38,7 +37,6 @@ def calculator(attrs={})
           end
 
           it "should receive elderly discount for single person" do
-            pending
             calculator(@attrs).discount.should == ElderlyDiscountCalculator::ELDERLY_DISCOUNT_SINGLE
           end
         end
@@ -49,7 +47,6 @@ def calculator(attrs={})
           end
 
           it "should not receive elderly discount" do
-            pending
             calculator(@attrs).discount.should == 0
           end
         end
@@ -66,7 +63,6 @@ def calculator(attrs={})
           end
 
           it "should receive elderly discount" do
-            pending
             calculator(@attrs).discount.should == ElderlyDiscountCalculator::ELDERLY_DISCOUNT
           end
         end
@@ -77,7 +73,6 @@ def calculator(attrs={})
           end
 
           it "should receive elderly discount" do
-            pending
             calculator(@attrs).discount.should == ElderlyDiscountCalculator::ELDERLY_DISCOUNT
           end
         end
@@ -88,7 +83,6 @@ def calculator(attrs={})
           end
 
           it "should not receive elderly discount" do
-            pending
             calculator(@attrs).discount.should == 0
           end
         end
@@ -103,13 +97,12 @@ def calculator(attrs={})
       end
 
       it "should not receive elderly discount" do
-        pending
         calculator(@attrs).discount.should be_zero
       end
     end
   end
 
   describe "#eligible?" do
-    it "should have specs"
+    # it "should have specs"
   end
 end