Merge pull request rubyforgood#168 from jaysonesmith/valid_image_tweak

Rspec syntax mod for valid_image check
leesharma · Oct 25, 2017 · bfb9c88 · bfb9c88
2 parents cc280de + 8393b8b
commit bfb9c88
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/views/items/_item.html.erb b/app/views/items/_item.html.erb
@@ -10,7 +10,7 @@
       <%= hidden_field_tag 'image_height', item.image_height %>
 
       <td>
-        <% if item.has_valid_image? %>
+        <% if item.valid_image? %>
           <%= image_tag item.image_url, width: item.image_width,
                                         height: item.image_height %>
         <% end %>

diff --git a/lib/amazon_product_api/search_item.rb b/lib/amazon_product_api/search_item.rb
@@ -31,7 +31,7 @@ def valid?
       price != "$0.00"
     end
 
-    def has_valid_image?
+    def valid_image?
       image.valid?
     end
 

diff --git a/spec/lib/amazon_product_api/search_item_spec.rb b/spec/lib/amazon_product_api/search_item_spec.rb
@@ -14,18 +14,18 @@
   end
 
   describe "#valid_image?" do
-    context "when all image attributes are valid" do
-      subject { AmazonProductAPI::SearchItem.new(image_url: "image url",
-                                                 image_height: 600,
-                                                 image_width: 800) }
-      it { should have_valid_image }
+    it "returns true for valid data" do
+      item = AmazonProductAPI::SearchItem.new(image_url: "image url",
+                                              image_height: 600,
+                                              image_width: 800)
+      expect(item.valid_image?).to eq true
     end
 
-    context "when there is no image url" do
-      subject { AmazonProductAPI::SearchItem.new(image_url: nil,
-                                                 image_height: 100,
-                                                 image_width: 100) }
-      it { should_not have_valid_image }
+    it "returns false for invalid data" do
+      item = AmazonProductAPI::SearchItem.new(image_url: nil,
+                                              image_height: 600,
+                                              image_width: 800)
+      expect(item.valid_image?).to eq false
     end
   end
 end