Download as
Browse Code »

Commit 6d4b2ddc82400cbbddff64de0b6d050d4b9b7dad

Authored by Antonio Terceiro
1 parent 83716d8a
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

Fix category-related tests 

At some point the display color became an arbitrary color and the tests
were never updated.
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
test/integration/assets_menu_test.rb
  Diff comments   View file @6d4b2dd
@@ -6,7 +6,7 @@ class AssetsMenuTest < ActionController::IntegrationTest @@ -6,7 +6,7 @@ class AssetsMenuTest < ActionController::IntegrationTest
6 # HomeController.any_instance.stubs(:get_layout).returns('application') 6 # HomeController.any_instance.stubs(:get_layout).returns('application')
7 # SearchController.any_instance.stubs(:get_layout).returns('application') 7 # SearchController.any_instance.stubs(:get_layout).returns('application')
8 8
9 - parent = Category.create!(:name => "Parent Category", :environment => Environment.default, :display_color => 1) 9 + parent = Category.create!(:name => "Parent Category", :environment => Environment.default, :display_color => '#888a85')
10 @category = Category.create!(:name => "Category A", :environment => Environment.default, :parent => parent) 10 @category = Category.create!(:name => "Category A", :environment => Environment.default, :parent => parent)
11 end 11 end
12 12
test/integration/categories_menu_test.rb
  Diff comments   View file @6d4b2dd
@@ -7,7 +7,7 @@ class CategoriesMenuTest < ActionController::IntegrationTest @@ -7,7 +7,7 @@ class CategoriesMenuTest < ActionController::IntegrationTest
7 SearchController.any_instance.stubs(:get_layout).returns('application') 7 SearchController.any_instance.stubs(:get_layout).returns('application')
8 8
9 Category.delete_all 9 Category.delete_all
10 - @cat1 = Category.create!(:display_in_menu => true, :name => 'Food', :environment => Environment.default, :display_color => 1) 10 + @cat1 = Category.create!(:display_in_menu => true, :name => 'Food', :environment => Environment.default, :display_color => '#888a85')
11 @cat2 = Category.create!(:display_in_menu => true, :name => 'Vegetables', :environment => Environment.default, :parent => @cat1) 11 @cat2 = Category.create!(:display_in_menu => true, :name => 'Vegetables', :environment => Environment.default, :parent => @cat1)
12 12
13 # all categories must be shown for these tests 13 # all categories must be shown for these tests