Commit 7fbb381df7943c34cb90278f923fa1df818f92ff
Committed by
Daniela Feitosa
1 parent
b71ad908
Exists in
staging
and in
42 other branches
Fixing Box tests
Showing
2 changed files
with
30 additions
and
2 deletions
Show diff stats
app/models/box.rb
| ... | ... | @@ -16,6 +16,8 @@ class Box < ActiveRecord::Base |
| 16 | 16 | CategoriesBlock |
| 17 | 17 | CommunitiesBlock |
| 18 | 18 | EnterprisesBlock |
| 19 | + EnvironmentStatisticsBlock | |
| 20 | + FansBlock | |
| 19 | 21 | FavoriteEnterprisesBlock |
| 20 | 22 | FeedReaderBlock |
| 21 | 23 | FriendsBlock |
| ... | ... | @@ -23,6 +25,7 @@ class Box < ActiveRecord::Base |
| 23 | 25 | LinkListBlock |
| 24 | 26 | LoginBlock |
| 25 | 27 | MainBlock |
| 28 | + MembersBlock | |
| 26 | 29 | MyNetworkBlock |
| 27 | 30 | PeopleBlock |
| 28 | 31 | ProfileImageBlock |
| ... | ... | @@ -39,8 +42,10 @@ class Box < ActiveRecord::Base |
| 39 | 42 | BlogArchivesBlock |
| 40 | 43 | CategoriesBlock |
| 41 | 44 | CommunitiesBlock |
| 45 | + DisabledEnterpriseMessageBlock | |
| 42 | 46 | EnterprisesBlock |
| 43 | 47 | EnvironmentStatisticsBlock |
| 48 | + FansBlock | |
| 44 | 49 | FavoriteEnterprisesBlock |
| 45 | 50 | FeaturedProductsBlock |
| 46 | 51 | FeedReaderBlock |
| ... | ... | @@ -49,8 +54,10 @@ class Box < ActiveRecord::Base |
| 49 | 54 | LinkListBlock |
| 50 | 55 | LocationBlock |
| 51 | 56 | LoginBlock |
| 57 | + MembersBlock | |
| 52 | 58 | MyNetworkBlock |
| 53 | 59 | PeopleBlock |
| 60 | + ProductsBlock | |
| 54 | 61 | ProfileImageBlock |
| 55 | 62 | ProfileInfoBlock |
| 56 | 63 | ProfileSearchBlock | ... | ... |
test/unit/box_test.rb
| ... | ... | @@ -5,36 +5,55 @@ class BoxTest < ActiveSupport::TestCase |
| 5 | 5 | should 'list allowed blocks for center box' do |
| 6 | 6 | blocks = Box.new(:position => 1).acceptable_blocks |
| 7 | 7 | |
| 8 | - assert blocks.include?('main-block') | |
| 8 | + assert !blocks.include?('block') | |
| 9 | + assert !blocks.include?('disabled-enterprise-message-block') | |
| 10 | + assert !blocks.include?('featured-products-block') | |
| 11 | + assert !blocks.include?('products-block') | |
| 12 | + assert !blocks.include?('profile-info-block') | |
| 13 | + assert !blocks.include?('profile-list-block') | |
| 14 | + assert !blocks.include?('profile-search-block') | |
| 15 | + assert !blocks.include?('slideshow-block') | |
| 16 | + assert !blocks.include?('location-block') | |
| 17 | + | |
| 9 | 18 | assert blocks.include?('article-block') |
| 10 | 19 | assert blocks.include?('blog-archives-block') |
| 20 | + assert blocks.include?('categories-block') | |
| 11 | 21 | assert blocks.include?('communities-block') |
| 12 | 22 | assert blocks.include?('enterprises-block') |
| 23 | + assert blocks.include?('environment-statistics-block') | |
| 24 | + assert blocks.include?('fans-block') | |
| 13 | 25 | assert blocks.include?('favorite-enterprises-block') |
| 14 | 26 | assert blocks.include?('feed-reader-block') |
| 15 | 27 | assert blocks.include?('friends-block') |
| 28 | + assert blocks.include?('highlights-block') | |
| 16 | 29 | assert blocks.include?('link-list-block') |
| 30 | + assert blocks.include?('login-block') | |
| 17 | 31 | assert blocks.include?('main-block') |
| 32 | + assert blocks.include?('members-block') | |
| 18 | 33 | assert blocks.include?('my-network-block') |
| 19 | 34 | assert blocks.include?('people-block') |
| 20 | 35 | assert blocks.include?('profile-image-block') |
| 21 | 36 | assert blocks.include?('raw-html-block') |
| 22 | 37 | assert blocks.include?('recent-documents-block') |
| 38 | + assert blocks.include?('sellers-search-block') | |
| 23 | 39 | assert blocks.include?('tags-block') |
| 24 | - | |
| 25 | 40 | end |
| 26 | 41 | |
| 27 | 42 | should 'list allowed blocks for box at position 2' do |
| 28 | 43 | blocks = Box.new(:position => 2).acceptable_blocks |
| 29 | 44 | |
| 30 | 45 | assert !blocks.include?('main-block') |
| 46 | + assert !blocks.include?('block') | |
| 47 | + assert !blocks.include?('profile-list-block') | |
| 31 | 48 | |
| 32 | 49 | assert blocks.include?('article-block') |
| 33 | 50 | assert blocks.include?('blog-archives-block') |
| 34 | 51 | assert blocks.include?('categories-block') |
| 35 | 52 | assert blocks.include?('communities-block') |
| 53 | + assert blocks.include?('disabled-enterprise-message-block') | |
| 36 | 54 | assert blocks.include?('enterprises-block') |
| 37 | 55 | assert blocks.include?('environment-statistics-block') |
| 56 | + assert blocks.include?('fans-block') | |
| 38 | 57 | assert blocks.include?('favorite-enterprises-block') |
| 39 | 58 | assert blocks.include?('featured-products-block') |
| 40 | 59 | assert blocks.include?('feed-reader-block') |
| ... | ... | @@ -43,8 +62,10 @@ class BoxTest < ActiveSupport::TestCase |
| 43 | 62 | assert blocks.include?('link-list-block') |
| 44 | 63 | assert blocks.include?('location-block') |
| 45 | 64 | assert blocks.include?('login-block') |
| 65 | + assert blocks.include?('members-block') | |
| 46 | 66 | assert blocks.include?('my-network-block') |
| 47 | 67 | assert blocks.include?('people-block') |
| 68 | + assert blocks.include?('products-block') | |
| 48 | 69 | assert blocks.include?('profile-image-block') |
| 49 | 70 | assert blocks.include?('profile-info-block') |
| 50 | 71 | assert blocks.include?('profile-search-block') | ... | ... |