Download as
Browse Code »

Commit 3f709f13dafaa6c2b17b854dc60a654e534862bd

Authored by AntonioTerceiro
1 parent 1ea8caaf
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

ActionItem62: s/favourite/favorite/, again 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@921 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
test/fixtures/design_blocks.yml
  Diff comments   View file @3f709f1
... ... @@ -6,18 +6,18 @@ one:
6 6 position: 1
7 7 type: 'MainBlock'
8 8 title: 'Main Content'
9   -# FavouriteLinks Blocks
  9 +# FavoriteLinks Blocks
10 10 two:
11 11 id: 2
12 12 box_id: 1
13 13 position: 2
14   - type: 'FavouriteLinks'
  14 + type: 'FavoriteLinks'
15 15 title: 'List of Links 1'
16 16 three:
17 17 id: 3
18 18 box_id: 1
19 19 position: 3
20   - type: 'FavouriteLinks'
  20 + type: 'FavoriteLinks'
21 21 title: 'List of Link 2'
22 22 #List Blocks
23 23 #FIXME Put other blocks to works
... ...
test/integration/routing_test.rb
  Diff comments   View file @3f709f1
... ... @@ -85,7 +85,7 @@ class RoutingTest < ActionController::IntegrationTest
85 85 end
86 86  
87 87 def test_routing_to_controllers_inside_design_blocks_directory
88   - assert_routing('/block/favourite_links/show/1', :controller => 'favourite_links', :action => 'show', :id => '1')
  88 + assert_routing('/block/favorite_links/show/1', :controller => 'favorite_links', :action => 'show', :id => '1')
89 89 end
90 90  
91 91 end
... ...