Make the ingredient brand parenthetical and optional.

eee-c · Mar 29, 2009 · 8e05027 · 8e05027
1 parent 675dc42
commit 8e05027
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/spec/views/recipe.haml_spec.rb b/spec/views/recipe.haml_spec.rb
@@ -43,6 +43,10 @@
           should have_selector(".ingredient > .quantity", :content => '1')
       end
     end
+
+    it "should not render a brand" do
+      response.should_not have_selector(".ingredient > .brand")
+    end
   end
 
   context "a recipe with 1 cup of all-purpose, unbleached flour" do
@@ -106,5 +110,14 @@
                                :content => 'Nestle Tollhouse')
       end
     end
+
+    it "should note the brand parenthetically after the name" do
+      response.should have_selector(".preparations") do |preparations|
+        preparations.
+          should have_selector(".ingredient > .name + .brand",
+                               :content => '(Nestle Tollhouse)')
+      end
+
+    end
   end
 end
diff --git a/views/recipe.haml b/views/recipe.haml
@@ -13,5 +13,6 @@
           = preparation['ingredient']['kind']
         %span.name
           = preparation['ingredient']['name']
-        %span.brand
-          = preparation['brand']
+        - if preparation['brand']
+          %span.brand
+            = "(" + preparation['brand'] + ")"