Commit 6d4b2ddc82400cbbddff64de0b6d050d4b9b7dad

Authored by Antonio Terceiro
1 parent 83716d8a

Fix category-related tests

At some point the display color became an arbitrary color and the tests
were never updated.
test/integration/assets_menu_test.rb
@@ -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
@@ -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