Download as
Browse Code »

Commit 3f709f13dafaa6c2b17b854dc60a654e534862bd

Authored by AntonioTerceiro
1 parent 1ea8caaf
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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,18 +6,18 @@ one:
6 position: 1 6 position: 1
7 type: 'MainBlock' 7 type: 'MainBlock'
8 title: 'Main Content' 8 title: 'Main Content'
9 -# FavouriteLinks Blocks 9 +# FavoriteLinks Blocks
10 two: 10 two:
11 id: 2 11 id: 2
12 box_id: 1 12 box_id: 1
13 position: 2 13 position: 2
14 - type: 'FavouriteLinks' 14 + type: 'FavoriteLinks'
15 title: 'List of Links 1' 15 title: 'List of Links 1'
16 three: 16 three:
17 id: 3 17 id: 3
18 box_id: 1 18 box_id: 1
19 position: 3 19 position: 3
20 - type: 'FavouriteLinks' 20 + type: 'FavoriteLinks'
21 title: 'List of Link 2' 21 title: 'List of Link 2'
22 #List Blocks 22 #List Blocks
23 #FIXME Put other blocks to works 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,7 +85,7 @@ class RoutingTest < ActionController::IntegrationTest
85 end 85 end
86 86
87 def test_routing_to_controllers_inside_design_blocks_directory 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 end 89 end
90 90
91 end 91 end