Commit 7fe9195e276990c3792ee19a9c1b298d308f51d4
Committed by
Rafael Manzo
Rafael Manzo
1 parent
753516fa
Exists in
master
and in
28 other branches
[Mezuro] Rebasing compound_metric from mezuro.
Showing
3 changed files
with
0 additions
and
11 deletions
Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
| @@ -52,5 +52,4 @@ class MezuroPluginProfileController < ProfileController | @@ -52,5 +52,4 @@ 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 | ||
| 56 | end | 55 | end |
plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
| @@ -67,18 +67,9 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase | @@ -67,18 +67,9 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase | ||
| 67 | 67 | ||
| 68 | should 'get project results from a specific date' do | 68 | should 'get project results from a specific date' do |
| 69 | create_project_content | 69 | create_project_content |
| 70 | -#client = mock | ||
| 71 | -#Kalibro::Client::ProjectResultClient.expects(:new).returns(client) | ||
| 72 | - Kalibro::Client::ProjectResultClient.expects(:has_results_before).with(@name, @date).returns(true) | ||
| 73 | - Kalibro::Client::ProjectResultClient.expects(:last_result_before).with(@name, @date).returns(@project_result) | ||
| 74 | - assert_response 200 | ||
| 75 | - end | ||
| 76 | - | ||
| 77 | - create_project_content | ||
| 78 | mock_project_result | 70 | mock_project_result |
| 79 | Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project) | 71 | Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project) |
| 80 | get :project_result, :profile => @profile.identifier, :id => @content.id, :date => @project_result.date | 72 | get :project_result, :profile => @profile.identifier, :id => @content.id, :date => @project_result.date |
| 81 | - module_result_client.expects(:module_result).with(@name, @name, @project_result.date).returns(@module_result) | ||
| 82 | assert_response 200 | 73 | assert_response 200 |
| 83 | end | 74 | end |
| 84 | 75 |