Download as
Browse Code »

Commit 2cc548359eeeda202ece7b534728163dfb58db8e

Authored by Weblate
2 parents 2b01c899 18a80c93
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

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 59 additions and 59 deletions   Show diff stats
app/models/box.rb
  Diff comments   View file @2cc5483
... ... @@ -14,8 +14,8 @@ class Box < ActiveRecord::Base
14 14 end
15 15  
16 16 def acceptable_blocks
17   - blocks_classes = central? ? Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => 1) : Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => [2, 3])
18   - to_css_selector(blocks_classes)
  17 + blocks_classes = if central? then Box.acceptable_center_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => 1) else Box.acceptable_side_blocks + plugins.dispatch(:extra_blocks, :type => owner.class, :position => [2, 3]) end
  18 + to_css_selector blocks_classes
19 19 end
20 20  
21 21 def central?
... ...
test/unit/box_test.rb
  Diff comments   View file @2cc5483
... ... @@ -18,67 +18,67 @@ class BoxTest < ActiveSupport::TestCase
18 18 should 'list allowed blocks for center box' do
19 19 blocks = Box.new.tap { |b| b.position = 1 }.acceptable_blocks
20 20  
21   - assert !blocks.include?('block')
22   - assert !blocks.include?('disabled-enterprise-message-block')
23   - assert !blocks.include?('featured-products-block')
24   - assert !blocks.include?('products-block')
25   - assert !blocks.include?('profile-info-block')
26   - assert !blocks.include?('profile-list-block')
27   - assert !blocks.include?('profile-search-block')
28   - assert !blocks.include?('slideshow-block')
29   - assert !blocks.include?('location-block')
30   -
31   - assert blocks.include?('article-block')
32   - assert blocks.include?('blog-archives-block')
33   - assert blocks.include?('categories-block')
34   - assert blocks.include?('communities-block')
35   - assert blocks.include?('enterprises-block')
36   - assert blocks.include?('fans-block')
37   - assert blocks.include?('favorite-enterprises-block')
38   - assert blocks.include?('feed-reader-block')
39   - assert blocks.include?('highlights-block')
40   - assert blocks.include?('link-list-block')
41   - assert blocks.include?('login-block')
42   - assert blocks.include?('main-block')
43   - assert blocks.include?('my-network-block')
44   - assert blocks.include?('profile-image-block')
45   - assert blocks.include?('raw-html-block')
46   - assert blocks.include?('recent-documents-block')
47   - assert blocks.include?('sellers-search-block')
48   - assert blocks.include?('tags-block')
  21 + assert !blocks.include?('.block')
  22 + assert !blocks.include?('.disabled-enterprise-message-block')
  23 + assert !blocks.include?('.featured-products-block')
  24 + assert !blocks.include?('.products-block')
  25 + assert !blocks.include?('.profile-info-block')
  26 + assert !blocks.include?('.profile-list-block')
  27 + assert !blocks.include?('.profile-search-block')
  28 + assert !blocks.include?('.slideshow-block')
  29 + assert !blocks.include?('.location-block')
  30 +
  31 + assert blocks.include?('.article-block')
  32 + assert blocks.include?('.blog-archives-block')
  33 + assert blocks.include?('.categories-block')
  34 + assert blocks.include?('.communities-block')
  35 + assert blocks.include?('.enterprises-block')
  36 + assert blocks.include?('.fans-block')
  37 + assert blocks.include?('.favorite-enterprises-block')
  38 + assert blocks.include?('.feed-reader-block')
  39 + assert blocks.include?('.highlights-block')
  40 + assert blocks.include?('.link-list-block')
  41 + assert blocks.include?('.login-block')
  42 + assert blocks.include?('.main-block')
  43 + assert blocks.include?('.my-network-block')
  44 + assert blocks.include?('.profile-image-block')
  45 + assert blocks.include?('.raw-html-block')
  46 + assert blocks.include?('.recent-documents-block')
  47 + assert blocks.include?('.sellers-search-block')
  48 + assert blocks.include?('.tags-block')
49 49 end
50 50  
51 51 should 'list allowed blocks for box at position 2' do
52 52 blocks = Box.new.tap { |b| b.position = 2 }.acceptable_blocks
53 53  
54   - assert !blocks.include?('main-block')
55   - assert !blocks.include?('block')
56   - assert !blocks.include?('profile-list-block')
57   -
58   - assert blocks.include?('article-block')
59   - assert blocks.include?('blog-archives-block')
60   - assert blocks.include?('categories-block')
61   - assert blocks.include?('communities-block')
62   - assert blocks.include?('disabled-enterprise-message-block')
63   - assert blocks.include?('enterprises-block')
64   - assert blocks.include?('fans-block')
65   - assert blocks.include?('favorite-enterprises-block')
66   - assert blocks.include?('featured-products-block')
67   - assert blocks.include?('feed-reader-block')
68   - assert blocks.include?('highlights-block')
69   - assert blocks.include?('link-list-block')
70   - assert blocks.include?('location-block')
71   - assert blocks.include?('login-block')
72   - assert blocks.include?('my-network-block')
73   - assert blocks.include?('products-block')
74   - assert blocks.include?('profile-image-block')
75   - assert blocks.include?('profile-info-block')
76   - assert blocks.include?('profile-search-block')
77   - assert blocks.include?('raw-html-block')
78   - assert blocks.include?('recent-documents-block')
79   - assert blocks.include?('sellers-search-block')
80   - assert blocks.include?('slideshow-block')
81   - assert blocks.include?('tags-block')
  54 + assert !blocks.include?('.main-block')
  55 + assert !blocks.include?('.block')
  56 + assert !blocks.include?('.profile-list-block')
  57 +
  58 + assert blocks.include?('.article-block')
  59 + assert blocks.include?('.blog-archives-block')
  60 + assert blocks.include?('.categories-block')
  61 + assert blocks.include?('.communities-block')
  62 + assert blocks.include?('.disabled-enterprise-message-block')
  63 + assert blocks.include?('.enterprises-block')
  64 + assert blocks.include?('.fans-block')
  65 + assert blocks.include?('.favorite-enterprises-block')
  66 + assert blocks.include?('.featured-products-block')
  67 + assert blocks.include?('.feed-reader-block')
  68 + assert blocks.include?('.highlights-block')
  69 + assert blocks.include?('.link-list-block')
  70 + assert blocks.include?('.location-block')
  71 + assert blocks.include?('.login-block')
  72 + assert blocks.include?('.my-network-block')
  73 + assert blocks.include?('.products-block')
  74 + assert blocks.include?('.profile-image-block')
  75 + assert blocks.include?('.profile-info-block')
  76 + assert blocks.include?('.profile-search-block')
  77 + assert blocks.include?('.raw-html-block')
  78 + assert blocks.include?('.recent-documents-block')
  79 + assert blocks.include?('.sellers-search-block')
  80 + assert blocks.include?('.slideshow-block')
  81 + assert blocks.include?('.tags-block')
82 82 end
83 83  
84 84 should 'list plugin block as allowed for box at position 1' do
... ...
test/unit/manage_products_helper_test.rb
  Diff comments   View file @2cc5483
... ... @@ -101,7 +101,7 @@ class ManageProductsHelperTest < ActionView::TestCase
101 101 category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
102 102 product = fast_create(Product, :product_category_id => category.id)
103 103  
104   - expects(:ui_button_to_remote).with('link to edit', {:update => "product-info", :loading => "loading_for_button('#edit-product-remote-button-ui-info')", :url => {:controller => 'manage_products', :action => 'edit', :id => product.id, :field => 'info'}, :complete => "$('#edit-product-button-ui-info').hide()", :method => :get}, :id => 'edit-product-remote-button-ui-info').returns('LINK')
  104 + expects(:ui_button_to_remote).with('link to edit', {:update => "product-info", :url => {:controller => 'manage_products', :action => 'edit', :id => product.id, :field => 'info'}, :complete => "jQuery('#edit-product-button-ui-info').hide()", :method => :get, :loading => "loading_for_button('#edit-product-remote-button-ui-info')", }, :id => 'edit-product-remote-button-ui-info').returns('LINK')
105 105  
106 106 assert_equal 'LINK', edit_product_ui_button_to_remote(product, 'info', 'link to edit')
107 107 end
... ...