Download as
Browse Code »

Commit bef57db15d5dfcb15c69412807a36160fcd1219a

Authored by João M. M. da Silva + Renan Teruo
Committed by Rafael Manzo
1 parent d7ff510c
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

[Mezuro] Fixing rebase error

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @bef57db
@@ -52,4 +52,5 @@ class MezuroPluginProfileController < ProfileController @@ -52,4 +52,5 @@ class MezuroPluginProfileController < ProfileController
52 modules_results = content.result_history(params[:module_name]) 52 modules_results = content.result_history(params[:module_name])
53 score_history = modules_results.collect { |module_result| module_result.grade } 53 score_history = modules_results.collect { |module_result| module_result.grade }
54 render :partial => 'content_viewer/score_history', :locals => {:score_history => score_history} 54 render :partial => 'content_viewer/score_history', :locals => {:score_history => score_history}
  55 + end
55 end 56 end
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
  Diff comments   View file @bef57db
@@ -92,9 +92,11 @@ returns(module_result) @@ -92,9 +92,11 @@ returns(module_result)
92 end 92 end
93 93
94 should 'not save a project with an existing project name in kalibro' do 94 should 'not save a project with an existing project name in kalibro' do
95 - Kalibro::Client::ProjectClient.expects(:project).with(@content.name).returns(mock) 95 + client = mock
  96 + Kalibro::Client::ProjectClient.expects(:new).returns(client)
  97 + client.expects(:project_names).returns([@content.name])
96 @content.send :validate_kalibro_project_name 98 @content.send :validate_kalibro_project_name
97 - assert_equal @content.errors.on_base, "Project name already exists in Kalibro" 99 + assert_equal "Project name already exists in Kalibro", @content.errors.on_base
98 end 100 end
99 101
100 private 102 private