[Git][noosfero/noosfero][master] 3 commits: products: fix template filename

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
f2713b75 by Braulio Bhavamitra at 2016-05-20T20:55:42-03:00
products: fix template filename

- - - - -
ada10278 by Braulio Bhavamitra at 2016-05-20T20:58:47-03:00
products: fix random failing test

- - - - -
72d90efd by Braulio Bhavamitra at 2016-05-20T21:45:27-03:00
Merge branch 'products-fixes' into noosfero

- - - - -


2 changed files:

- plugins/products/test/unit/profile_test.rb
- plugins/products/views/profile_editor/products_profile_info_contents.html.slim → plugins/products/views/profile_editor/_products_profile_info_contents.html.slim


Changes:

=====================================
plugins/products/test/unit/profile_test.rb
=====================================
--- a/plugins/products/test/unit/profile_test.rb
+++ b/plugins/products/test/unit/profile_test.rb
@@ -22,9 +22,8 @@ class ProfileTest < ActiveSupport::TestCase
   end
 
   should 'collect the highlighted products with image' do
-    env = Environment.default
     e1 = fast_create(Enterprise)
-    p1 = create(Product, name: 'test_prod1', product_category_id: @product_category.id, enterprise: e1)
+    create(Product, name: 'test_prod1', product_category_id: @product_category.id, enterprise: e1)
     products = []
     3.times {|n|
       products.push(create(Product, name: "product #{n}", profile_id: e1.id,
@@ -36,7 +35,8 @@ class ProfileTest < ActiveSupport::TestCase
     create(Product, name: "product 5", profile_id: e1.id, product_category_id: @product_category.id, image_builder: {
       uploaded_data: fixture_file_upload('/files/rails.png', 'image/png')
     })
-    assert_equal products, e1.highlighted_products_with_image
+
+    assert_equivalent products, e1.highlighted_products_with_image
   end
 
   should 'have many inputs through products' do


=====================================
plugins/products/views/profile_editor/products_profile_info_contents.html.slim → plugins/products/views/profile_editor/_products_profile_info_contents.html.slim
=====================================
--- a/plugins/products/views/profile_editor/products_profile_info_contents.html.slim
+++ b/plugins/products/views/profile_editor/_products_profile_info_contents.html.slim



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/315ed27e4c783ea9ae2fc76dc3e117f67e863593...72d90efda49fab7809129882df6d3e86bcff9868
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160521/b782a5c1/attachment-0001.html>