From 070dfc0914c8b397fb27d9de0b0b854856a12bc8 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Tue, 20 Jul 2010 00:28:14 -0300
Subject: [PATCH] The FeaturedProductsBlock doesn't works with noosfero 0.25.0 version.

---
 app/helpers/application_helper.rb           |  4 ++++
 app/helpers/display_helper.rb               |  6 +++++-
 app/helpers/manage_products_helper.rb       |  4 ----
 app/views/blocks/featured_products.rhtml    |  4 ++--
 features/featured_products_block.feature    | 35 +++++++++++++++++++++++++++++++++++
 features/step_definitions/noosfero_steps.rb |  3 ++-
 6 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 features/featured_products_block.feature

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2577a97..6c40a73 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -973,4 +973,8 @@ module ApplicationHelper
     link_to_remote(label, options, html_options.merge(:class => 'ui_button fg-button'))
   end
 
+  def float_to_currency(value)
+    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
+  end
+
 end
diff --git a/app/helpers/display_helper.rb b/app/helpers/display_helper.rb
index 989121c..94d6c6e 100644
--- a/app/helpers/display_helper.rb
+++ b/app/helpers/display_helper.rb
@@ -2,12 +2,16 @@ module DisplayHelper
 
   def link_to_product(product, opts={})
     return _('No product') unless product
-    target = product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
+    target = product_path(product)
     link_to content_tag( 'span', product.name ),
             target,
             opts
   end
 
+  def product_path(product)
+    product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
+  end
+
   def link_to_category(category, full = true)
     return _('Uncategorized product') unless category
     name = full ? category.full_name(' &rarr; ') : category.name
diff --git a/app/helpers/manage_products_helper.rb b/app/helpers/manage_products_helper.rb
index 6ff212e..14c48fa 100644
--- a/app/helpers/manage_products_helper.rb
+++ b/app/helpers/manage_products_helper.rb
@@ -152,10 +152,6 @@ module ManageProductsHelper
     link_to(_('Change category'), { :action => 'edit_category', :id => product.id}, options)
   end
 
-  def float_to_currency(value)
-    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
-  end
-
   def display_value(product)
     price = product.price
     unless price.blank? || price.zero?
diff --git a/app/views/blocks/featured_products.rhtml b/app/views/blocks/featured_products.rhtml
index 67cffec..1b68288 100644
--- a/app/views/blocks/featured_products.rhtml
+++ b/app/views/blocks/featured_products.rhtml
@@ -9,13 +9,13 @@
             <ul>
             <% group.reject{ |x| x.nil? }.each_with_index do |p, i| %>
             <li class="featured-product-item">
-            <%= link_to content_tag(:img, nil, :src => p.image.public_filename(:thumb), :alt => p.name, :class => ('reflect' if block.reflect)), product_path(p.enterprise.identifier, p), :class => 'featured-product-image' %>
+            <%= link_to content_tag(:img, nil, :src => p.image.public_filename(:thumb), :alt => p.name, :class => ('reflect' if block.reflect)), product_path(p), :class => 'featured-product-image' %>
               <div class="featured-product-info position-<%= i + 1 %>" style="display: none">
                 <div class="featured-product-text">
                   <h3><%= p.name %></h3>
                   <p class="featured-product-price"><%= float_to_currency(p.price) %></p>
                   <p class="featured-product-desc"><%= p.description.chars[0...50].to_s + '...' %></p>
-                  <p><%= link_to _('See More'), product_path(p.enterprise.identifier, p), :class => 'featured-product-link' %></p>
+                  <p><%= link_to _('See More'), product_path(p), :class => 'featured-product-link' %></p>
                 </div>
               </div>
             </li>
diff --git a/features/featured_products_block.feature b/features/featured_products_block.feature
new file mode 100644
index 0000000..8b78a09
--- /dev/null
+++ b/features/featured_products_block.feature
@@ -0,0 +1,35 @@
+Feature: featured_products_block
+  As a profile owner
+  I want to edit the featured block
+
+  Background:
+    Given I am on the homepage
+    And the following users
+      | login       | name         |
+      | eddievedder | Eddie Vedder |
+    And the following enterprises
+      | identifier | owner | name | enabled |
+      | redemoinho | eddievedder | Rede Moinho | true |
+    And the following blocks
+      | owner       | type          |
+      | redemoinho | FeaturedProductsBlock |
+    And the following product_category
+      | name |
+      | automobile |
+    And the following products
+      | owner      | category | name | description | highlighted |
+      | redemoinho | automobile  | Car | Red Car | true |
+      | redemoinho | automobile  | Truck | Blue Truck | true |
+    And I am logged in as "eddievedder"
+
+  @selenium
+  Scenario: select a product to be featured
+    And I follow "Manage my groups"
+    And I follow "Control panel of this group"
+    And I follow "Edit sideboxes"
+    Given I follow "Edit" within ".featured-products-block"
+    And I select "Car"
+    When I press "Save"
+    Then I should see "Car"
+    And I should not see "float_to_currency"
+    And I should not see "product_path"
diff --git a/features/step_definitions/noosfero_steps.rb b/features/step_definitions/noosfero_steps.rb
index 76a2355..1a28815 100644
--- a/features/step_definitions/noosfero_steps.rb
+++ b/features/step_definitions/noosfero_steps.rb
@@ -62,7 +62,8 @@ Given /^the following products$/ do |table|
     data = item.dup
     owner = Enterprise[data.delete("owner")]
     category = Category.find_by_slug(data.delete("category"))
-    Product.create!(data.merge(:enterprise => owner, :product_category => category))
+    product = Product.create!(data.merge(:enterprise => owner, :product_category => category))
+    image = Image.create!(:owner => product, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
   end
 end
 
--
libgit2 0.21.2