Download as
Browse Code »

Commit 45b0f5dae6028eb6e59843112437d5b3d970a950

Authored by Daniela Feitosa
1 parent aaca62c7
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixing tests 

(ActionItem1996)
Showing 3 changed files with 6 additions and 1 deletions   Show diff stats
app/helpers/catalog_helper.rb
  Diff comments   View file @45b0f5d
@@ -5,8 +5,9 @@ include ManageProductsHelper @@ -5,8 +5,9 @@ include ManageProductsHelper
5 5
6 def display_products_list(profile, products) 6 def display_products_list(profile, products)
7 data = '' 7 data = ''
  8 + extra_content = []
8 products.each { |product| 9 products.each { |product|
9 - extra_content = @plugins.map(:catalog_item_extras, product).collect { |content| instance_eval(&content) } 10 + extra_content = @plugins.map(:catalog_item_extras, product).collect { |content| instance_eval(&content) } if @plugins
10 data << content_tag('li', 11 data << content_tag('li',
11 link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:portrait) ) + 12 link_to_product(product, :class => 'product-pic', :style => 'background-image:url(%s)' % product.default_image(:portrait) ) +
12 content_tag('h3', link_to_product(product)) + 13 content_tag('h3', link_to_product(product)) +
test/functional/profile_controller_test.rb
  Diff comments   View file @45b0f5d
@@ -1164,6 +1164,8 @@ class ProfileControllerTest &lt; Test::Unit::TestCase @@ -1164,6 +1164,8 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
1164 tabs = [plugin1_tab, plugin2_tab] 1164 tabs = [plugin1_tab, plugin2_tab]
1165 plugins = mock() 1165 plugins = mock()
1166 plugins.stubs(:map).with(:profile_tabs).returns(tabs) 1166 plugins.stubs(:map).with(:profile_tabs).returns(tabs)
  1167 + plugins.stubs(:enabled_plugins).returns([])
  1168 + plugins.stubs(:map).with(:body_beginning).returns([])
1167 Noosfero::Plugin::Manager.stubs(:new).returns(plugins) 1169 Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
1168 1170
1169 get :index, :profile => profile.identifier 1171 get :index, :profile => profile.identifier
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @45b0f5d
@@ -870,6 +870,8 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase @@ -870,6 +870,8 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
870 buttons = [plugin1_button, plugin2_button] 870 buttons = [plugin1_button, plugin2_button]
871 plugins = mock() 871 plugins = mock()
872 plugins.stubs(:map).with(:control_panel_buttons).returns(buttons) 872 plugins.stubs(:map).with(:control_panel_buttons).returns(buttons)
  873 + plugins.stubs(:enabled_plugins).returns([])
  874 + plugins.stubs(:map).with(:body_beginning).returns([])
873 Noosfero::Plugin::Manager.stubs(:new).returns(plugins) 875 Noosfero::Plugin::Manager.stubs(:new).returns(plugins)
874 876
875 get :index, :profile => profile.identifier 877 get :index, :profile => profile.identifier