noosfero | 2 new commits pushed to repository

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/0d5da1e6ca385d37f449871d9a9def0b83a136ba">0d5da1e6</a> by Braulio Bhavamitra
boxes: fix tests

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/18a80c93d7c750baeafb2ded3768de362cc3e676">18a80c93</a> by Braulio Bhavamitra
manage_products: fix test

- - - - -


Changes:

=====================================
app/models/box.rb
=====================================
--- a/app/models/box.rb
+++ b/app/models/box.rb
@@ -14,8 +14,8 @@ class Box < ActiveRecord::Base
   end
 
   def acceptable_blocks
-    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])
-    to_css_selector(blocks_classes)
+    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
+    to_css_selector blocks_classes
   end
 
   def central?

=====================================
test/unit/box_test.rb
=====================================
--- a/test/unit/box_test.rb
+++ b/test/unit/box_test.rb
@@ -18,67 +18,67 @@ class BoxTest < ActiveSupport::TestCase
   should 'list allowed blocks for center box' do
     blocks = Box.new.tap { |b| b.position = 1 }.acceptable_blocks
 
-    assert !blocks.include?('block')
-    assert !blocks.include?('disabled-enterprise-message-block')
-    assert !blocks.include?('featured-products-block')
-    assert !blocks.include?('products-block')
-    assert !blocks.include?('profile-info-block')
-    assert !blocks.include?('profile-list-block')
-    assert !blocks.include?('profile-search-block')
-    assert !blocks.include?('slideshow-block')
-    assert !blocks.include?('location-block')
-
-    assert blocks.include?('article-block')
-    assert blocks.include?('blog-archives-block')
-    assert blocks.include?('categories-block')
-    assert blocks.include?('communities-block')
-    assert blocks.include?('enterprises-block')
-    assert blocks.include?('fans-block')
-    assert blocks.include?('favorite-enterprises-block')
-    assert blocks.include?('feed-reader-block')
-    assert blocks.include?('highlights-block')
-    assert blocks.include?('link-list-block')
-    assert blocks.include?('login-block')
-    assert blocks.include?('main-block')
-    assert blocks.include?('my-network-block')
-    assert blocks.include?('profile-image-block')
-    assert blocks.include?('raw-html-block')
-    assert blocks.include?('recent-documents-block')
-    assert blocks.include?('sellers-search-block')
-    assert blocks.include?('tags-block')
+    assert !blocks.include?('.block')
+    assert !blocks.include?('.disabled-enterprise-message-block')
+    assert !blocks.include?('.featured-products-block')
+    assert !blocks.include?('.products-block')
+    assert !blocks.include?('.profile-info-block')
+    assert !blocks.include?('.profile-list-block')
+    assert !blocks.include?('.profile-search-block')
+    assert !blocks.include?('.slideshow-block')
+    assert !blocks.include?('.location-block')
+
+    assert blocks.include?('.article-block')
+    assert blocks.include?('.blog-archives-block')
+    assert blocks.include?('.categories-block')
+    assert blocks.include?('.communities-block')
+    assert blocks.include?('.enterprises-block')
+    assert blocks.include?('.fans-block')
+    assert blocks.include?('.favorite-enterprises-block')
+    assert blocks.include?('.feed-reader-block')
+    assert blocks.include?('.highlights-block')
+    assert blocks.include?('.link-list-block')
+    assert blocks.include?('.login-block')
+    assert blocks.include?('.main-block')
+    assert blocks.include?('.my-network-block')
+    assert blocks.include?('.profile-image-block')
+    assert blocks.include?('.raw-html-block')
+    assert blocks.include?('.recent-documents-block')
+    assert blocks.include?('.sellers-search-block')
+    assert blocks.include?('.tags-block')
   end
 
   should 'list allowed blocks for box at position 2' do
     blocks = Box.new.tap { |b| b.position = 2 }.acceptable_blocks
 
-    assert !blocks.include?('main-block')
-    assert !blocks.include?('block')
-    assert !blocks.include?('profile-list-block')
-
-    assert blocks.include?('article-block')
-    assert blocks.include?('blog-archives-block')
-    assert blocks.include?('categories-block')
-    assert blocks.include?('communities-block')
-    assert blocks.include?('disabled-enterprise-message-block')
-    assert blocks.include?('enterprises-block')
-    assert blocks.include?('fans-block')
-    assert blocks.include?('favorite-enterprises-block')
-    assert blocks.include?('featured-products-block')
-    assert blocks.include?('feed-reader-block')
-    assert blocks.include?('highlights-block')
-    assert blocks.include?('link-list-block')
-    assert blocks.include?('location-block')
-    assert blocks.include?('login-block')
-    assert blocks.include?('my-network-block')
-    assert blocks.include?('products-block')
-    assert blocks.include?('profile-image-block')
-    assert blocks.include?('profile-info-block')
-    assert blocks.include?('profile-search-block')
-    assert blocks.include?('raw-html-block')
-    assert blocks.include?('recent-documents-block')
-    assert blocks.include?('sellers-search-block')
-    assert blocks.include?('slideshow-block')
-    assert blocks.include?('tags-block')
+    assert !blocks.include?('.main-block')
+    assert !blocks.include?('.block')
+    assert !blocks.include?('.profile-list-block')
+
+    assert blocks.include?('.article-block')
+    assert blocks.include?('.blog-archives-block')
+    assert blocks.include?('.categories-block')
+    assert blocks.include?('.communities-block')
+    assert blocks.include?('.disabled-enterprise-message-block')
+    assert blocks.include?('.enterprises-block')
+    assert blocks.include?('.fans-block')
+    assert blocks.include?('.favorite-enterprises-block')
+    assert blocks.include?('.featured-products-block')
+    assert blocks.include?('.feed-reader-block')
+    assert blocks.include?('.highlights-block')
+    assert blocks.include?('.link-list-block')
+    assert blocks.include?('.location-block')
+    assert blocks.include?('.login-block')
+    assert blocks.include?('.my-network-block')
+    assert blocks.include?('.products-block')
+    assert blocks.include?('.profile-image-block')
+    assert blocks.include?('.profile-info-block')
+    assert blocks.include?('.profile-search-block')
+    assert blocks.include?('.raw-html-block')
+    assert blocks.include?('.recent-documents-block')
+    assert blocks.include?('.sellers-search-block')
+    assert blocks.include?('.slideshow-block')
+    assert blocks.include?('.tags-block')
   end
 
   should 'list plugin block as allowed for box at position 1' do

=====================================
test/unit/manage_products_helper_test.rb
=====================================
--- a/test/unit/manage_products_helper_test.rb
+++ b/test/unit/manage_products_helper_test.rb
@@ -101,7 +101,7 @@ class ManageProductsHelperTest < ActionView::TestCase
     category = fast_create(ProductCategory, :name => 'Category 1', :environment_id => @environment.id)
     product = fast_create(Product, :product_category_id => category.id)
 
-    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')
+    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')
 
     assert_equal 'LINK', edit_product_ui_button_to_remote(product, 'info', 'link to edit')
   end

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150213/9131e82f/attachment-0001.html>