Download as
Browse Code »

Commit 480247c58fa4dc84e1d5d00cfc0146f9589bac81

Authored by Rodrigo Souto
1 parent 66707ca9
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

catalog-tests: fix per page value and remove obsolete test

Showing 1 changed file with 1 additions and 20 deletions   Show diff stats
test/functional/catalog_controller_test.rb
  Diff comments   View file @480247c
... ... @@ -47,7 +47,7 @@ class CatalogControllerTest < ActionController::TestCase
47 47  
48 48 assert_equal 12, @enterprise.products.count
49 49 get :index, :profile => @enterprise.identifier
50   - assert_equal 9, assigns(:products).count
  50 + assert_equal 6, assigns(:products).count
51 51 assert_tag :a, :attributes => {:class => 'next_page'}
52 52 end
53 53  
... ... @@ -170,25 +170,6 @@ class CatalogControllerTest < ActionController::TestCase
170 170 assert_tag :tag => 'img', :attributes => { :class => 'star', :src => /star.png/ }
171 171 end
172 172  
173   - should 'display categories and sub-categories link' do
174   - pc1 = ProductCategory.create!(:name => "PC1", :environment => @enterprise.environment)
175   - pc2 = ProductCategory.create!(:name => "PC2", :environment => @enterprise.environment, :parent_id => pc1.id)
176   - pc3 = ProductCategory.create!(:name => "PC3", :environment => @enterprise.environment, :parent_id => pc1.id)
177   - pc4 = ProductCategory.create!(:name => "PC4", :environment => @enterprise.environment, :parent_id => pc2.id)
178   - p1 = fast_create(Product, :product_category_id => pc1.id, :profile_id => @enterprise.id)
179   - p2 = fast_create(Product, :product_category_id => pc2.id, :profile_id => @enterprise.id)
180   - p3 = fast_create(Product, :product_category_id => pc3.id, :profile_id => @enterprise.id)
181   - p4 = fast_create(Product, :product_category_id => pc4.id, :profile_id => @enterprise.id)
182   -
183   - get :index, :profile => @enterprise.identifier
184   -
185   - assert_tag :tag => 'a', :attributes => {:href => /level=#{pc1.id}/}
186   - assert_tag :tag => 'a', :attributes => {:href => /level=#{pc2.id}/}
187   - assert_tag :tag => 'a', :attributes => {:href => /level=#{pc3.id}/}
188   - assert_no_tag :tag => 'a', :attributes => {:href => /level=#{pc4.id}/}
189   - end
190   -
191   -
192 173 should 'display categories on breadcrumb' do
193 174 pc1 = ProductCategory.create!(:name => "PC1", :environment => @enterprise.environment)
194 175 pc2 = ProductCategory.create!(:name => "PC2", :environment => @enterprise.environment, :parent_id => pc1.id)
... ...