From efe7e543f33b0a4d5c5818fb17529efb2cdcbcf1 Mon Sep 17 00:00:00 2001 From: Carlos Morais + Paulo Meirelles Date: Tue, 14 Feb 2012 14:10:47 -0200 Subject: [PATCH] [Mezuro] Case when range is nil --- plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 1 + plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb | 10 +++++----- plugins/mezuro/views/content_viewer/_module_result.rhtml | 8 ++++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb index 61cb96c..54b4857 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb @@ -1,4 +1,5 @@ class MezuroPluginProfileController < ProfileController + append_view_path File.join(File.dirname(__FILE__) + '/../views') def metrics diff --git a/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb b/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb index 205cfb5..b8e5e87 100644 --- a/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb +++ b/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb @@ -15,6 +15,7 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase @module_result = ModuleResultFixtures.create @project_result = ProjectResultFixtures.qt_calculator @project = @project_result.project + @project_content = create_project_content(@profile) end def test_metrics_for_unknown_project @@ -28,13 +29,12 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase end should 'get metrics from a known module' do - project_content = create_project_content(@profile) - project_name = project_content.name + project_name = @project_content.name module_name = project_name Kalibro::Client::ProjectResultClient.expects(:last_result).with(project_name).returns(@project_result) - Kalibro::Client::ModuleResultClient.expects(:module_result).with(project_content, module_name). + Kalibro::Client::ModuleResultClient.expects(:module_result).with(@project_content, module_name). returns(@module_result) - get :metrics, :profile => @profile_id, :id => project_content.id, :module_name => module_name + get :metrics, :profile => @profile_id, :id => @project_content.id, :module_name => module_name assert_response 200 # assert_tag # TODO end @@ -48,7 +48,7 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase Kalibro::Client::KalibroClient.expects(:process_project).with(project_content.name) project_content.save -# MezuroPlugin::ProjectContent.any_instance.stubs(:project_content).returns(project_content) + MezuroPlugin::ProjectContent.any_instance.stubs(:project_content).returns(project_content) project_content end diff --git a/plugins/mezuro/views/content_viewer/_module_result.rhtml b/plugins/mezuro/views/content_viewer/_module_result.rhtml index 39f7657..9a0d7dc 100644 --- a/plugins/mezuro/views/content_viewer/_module_result.rhtml +++ b/plugins/mezuro/views/content_viewer/_module_result.rhtml @@ -17,11 +17,15 @@ <% module_result.metric_results.each do |metric_result| %> <% range = metric_result.range %> - + <%= metric_result.metric.name %> <%= metric_result.value %> <%= metric_result.weight %> - <%= range.label %> + <% if range.nil? %> + + <% else %> + <%= range.label %> + <% end %> <% end %> -- libgit2 0.21.2