Download as
Browse Code »

Commit 031e5bd13a82c83a6761440b89aea0388ed346e4

Authored by Daniela Feitosa
1 parent 8f30e7a2
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

Fixed failing tests 

test/functional/application_controller_test.rb
test/functional/profile_themes_controller_test.rb
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/themes_controller.rb
  Diff comments   View file @031e5bd
... ... @@ -12,7 +12,7 @@ class ThemesController < ApplicationController
12 12  
13 13 def index
14 14 @environment = environment
15   - @themes = environment.themes + Theme.approved_themes(target)
  15 + @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
16 16  
17 17 @current_theme = target.theme
18 18  
... ...
test/functional/application_controller_test.rb
  Diff comments   View file @031e5bd
... ... @@ -233,7 +233,7 @@ class ApplicationControllerTest < ActionController::TestCase
233 233 get :index
234 234  
235 235 assert_tag :tag => 'div', :attributes => { :id => 'theme-test-panel' }, :descendant => {
236   - :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/edit/my-test-theme'}
  236 + :tag => 'a', :attributes => { :href => '/myprofile/testinguser/profile_themes/edit/my-test-theme'}
237 237 }
238 238 #{ :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/stop_test/my-test-theme'} }
239 239 end
... ...