issue #112 moved ingredients delete call to an else block, build a cu…

…stom matcher for collections, rewrote test that involved removing a recipe and not losing particular ingredients in the current grocery list

app/models/grocery_list.rb

@@ -27,9 +27,10 @@ def subtract_ingredient(sub_i)
       if list_i.matched?(sub_i)
         if list_i.sub(sub_i)
           return true
+        else
+          return self.ingredients.delete(list_i)
         end
       end
-      return self.ingredients.delete(list_i)
     end
   end
 

spec/models/meal_plan_spec.rb

@@ -101,7 +101,11 @@
     mealplan1.recipes << recipe7
     mealplan1.recipes << recipe9
     mealplan1.recipes.delete(recipe7)
-    expect(mealplan1.user.grocery_list.ingredients).to eq recipe7.ingredients.first
+    expect(mealplan1.user.grocery_list.ingredients).to contain_one_or_more_records_that(have_attributes(
+      :unit => recipe7.ingredients.first.unit,
+      :amount => recipe7.ingredients.first.amount,
+      :name => recipe7.ingredients.first.name)
+    )
   end
 
 end

spec/support/custom_matchers.rb

@@ -0,0 +1,8 @@
+# Helps to loop through a collection in search of one particular item that matches.
+RSpec::Matchers.define :contain_one_or_more_records_that do |matcher|
+  match do |collection|
+    collection.any? do |item|
+      matcher.matches?(item)
+    end
+  end
+end