Download as
Browse Code »

Commit 9843d7f9aa4d2978eaa96cc4d44d0ffff6c6b925

Authored by Diego Camarinha
Committed by Diego Camarinha
1 parent d17ae011
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

[Mezuro] Corrected some tests.

Showing 3 changed files with 9 additions and 11 deletions   Show diff stats
plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb
  Diff comments   View file @9843d7f
... ... @@ -38,7 +38,7 @@ class MezuroPluginModuleResultControllerTest < ActionController::TestCase
38 38  
39 39 should 'get metric result history' do
40 40 metric_name = @metric_result_hash[:configuration][:metric][:name]
41   - Kalibro::MetricResult.expects(:request).with(:history_of, { :metric_name => metric_name, :module_result_id => @module_result_hash[:id] }).
  41 + Kalibro::MetricResult.expects(:request).with(:history_of_metric, { :metric_name => metric_name, :module_result_id => @module_result_hash[:id] }).
42 42 returns({:date_metric_result => @date_metric_result_hash})
43 43 get :metric_result_history, :profile => @profile.identifier, :module_result_id => @module_result_hash[:id], :metric_name => metric_name
44 44 assert_equal DateTime.parse(@date_metric_result_hash[:date]), assigns(:history).first.date
... ...
plugins/mezuro/test/unit/kalibro/metric_result_test.rb
  Diff comments   View file @9843d7f
... ... @@ -33,7 +33,7 @@ class MetricResultTest < ActiveSupport::TestCase
33 33  
34 34 should 'return history of a metric with a module result id' do
35 35 module_result_id = 31
36   - Kalibro::MetricResult.expects(:request).with(:history_of, {:metric_name => @result.configuration.metric.name, :module_result_id => module_result_id}).returns({:date_metric_result => DateMetricResultFixtures.date_metric_result_hash})
  36 + Kalibro::MetricResult.expects(:request).with(:history_of_metric, {:metric_name => @result.configuration.metric.name, :module_result_id => module_result_id}).returns({:date_metric_result => DateMetricResultFixtures.date_metric_result_hash})
37 37 assert_equal DateMetricResultFixtures.date_metric_result_hash[:metric_result][:id], Kalibro::MetricResult.history_of(@result.configuration.metric.name, module_result_id).first.metric_result.id
38 38 end
39 39  
... ...
plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml
  Diff comments   View file @9843d7f
... ... @@ -9,18 +9,17 @@
9 9 <tbody>
10 10 <% @metric_results.each do |metric_result| %>
11 11 <% metric_configuration_snapshot = metric_result.metric_configuration_snapshot%>
12   - <% range_snapshots = metric_configuration_snapshot.range_snapshot %>
  12 + <% range_snapshot = metric_configuration_snapshot.range_snapshot %>
13 13 <% formatted_name = MezuroPlugin::Helpers::ContentViewerHelper.format_name(metric_configuration_snapshot) %>
14   - <% if !range_snapshots.nil? %>
  14 + <% if !range_snapshot.nil? %>
15 15 <tr>
16 16 <td style="width: 74%"><a href="#" show-metric-history="<%= formatted_name %>" data-module-id="<%= @module_result.id %>"><%= metric_configuration_snapshot.metric.name %></a></td>
17 17 <td><%= MezuroPlugin::Helpers::ContentViewerHelper.format_grade(metric_result.value) %></td>
18 18 <td><%= metric_configuration_snapshot.weight %></td>
19   - <% range_snapshots.each do |range_snapshot| %>
20   - <% if range_snapshot[:beginning].to_f <= metric_result.value and range_snapshot[:end].to_f > metric_result.value %>
21   - <td style="background-color: #<%= range_snapshot[:color] %>">
22   - <span title="<%= range_snapshot[:comments] %>" >
23   - <%= range_snapshot[:label] %>
  19 + <% if range_snapshot.beginning.to_f <= metric_result.value and range_snapshot.end.to_f > metric_result.value %>
  20 + <td style="background-color: #<%= range_snapshot.color %>">
  21 + <span title="<%= range_snapshot.comments %>" >
  22 + <%= range_snapshot.label %>
24 23 </span>
25 24 </td>
26 25 </tr>
... ... @@ -30,11 +29,10 @@
30 29 </div>
31 30 </td>
32 31 <td align="right">
33   - <%= range_snapshot[:comments].nil? ? '' : range_snapshot[:comments] %>
  32 + <%= range_snapshot.comments.nil? ? '' : range_snapshot.comments %>
34 33 </td>
35 34 </tr>
36 35 <% end %>
37   - <% end %>
38 36 <% end %>
39 37 <% end %>
40 38 </tbody>
... ...