Download as
Browse Code »

Commit 031e5bd13a82c83a6761440b89aea0388ed346e4

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

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,7 +12,7 @@ class ThemesController < ApplicationController
12 12
13 def index 13 def index
14 @environment = environment 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 @current_theme = target.theme 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,7 +233,7 @@ class ApplicationControllerTest < ActionController::TestCase
233 get :index 233 get :index
234 234
235 assert_tag :tag => 'div', :attributes => { :id => 'theme-test-panel' }, :descendant => { 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 #{ :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/stop_test/my-test-theme'} } 238 #{ :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/stop_test/my-test-theme'} }
239 end 239 end