Download as
Browse Code »

Commit 8f4bd8deedec6c1a80815e680b5dd547dabe1ac2

Authored by Carlos Morais + Paulo Meirelles
Committed by Paulo Meireles
1 parent 53e454a3
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

Fix MetricResult and ModuleResultClientTest (date)

Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
plugins/mezuro/lib/kalibro/entities/metric_result.rb
  Diff comments   View file @8f4bd8d
@@ -4,8 +4,11 @@ class Kalibro::Entities::MetricResult < Kalibro::Entities::Entity @@ -4,8 +4,11 @@ class Kalibro::Entities::MetricResult < Kalibro::Entities::Entity
4 4
5 def metric=(value) 5 def metric=(value)
6 if value.kind_of?(Hash) 6 if value.kind_of?(Hash)
7 - @metric = to_entity(value, Kalibro::Entities::CompoundMetric) if value.has_key?(:script)  
8 - @metric = to_entity(value, Kalibro::Entities::NativeMetric) 7 + if value.has_key?(:script)
  8 + @metric = to_entity(value, Kalibro::Entities::CompoundMetric)
  9 + else
  10 + @metric = to_entity(value, Kalibro::Entities::NativeMetric)
  11 + end
9 else 12 else
10 @metric = value 13 @metric = value
11 end 14 end
plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
  Diff comments   View file @8f4bd8d
@@ -9,10 +9,12 @@ class ModuleResultClientTest < Test::Unit::TestCase @@ -9,10 +9,12 @@ class ModuleResultClientTest < Test::Unit::TestCase
9 end 9 end
10 10
11 should 'get module result' do 11 should 'get module result' do
12 - request_body = {:project_name => 'Qt-Calculator', :module_name => 'main', :date => '42'} 12 + date_string = '2012-01-10T16:07:15.442-02:00'
  13 + date = DateTime.parse(date_string)
  14 + request_body = {:project_name => 'Qt-Calculator', :module_name => 'main', :date => date_string}
13 response = {:module_result => @result.to_hash} 15 response = {:module_result => @result.to_hash}
14 @port.expects(:request).with(:get_module_result, request_body).returns(response) 16 @port.expects(:request).with(:get_module_result, request_body).returns(response)
15 - assert_equal @result, @client.module_result('Qt-Calculator', 'main', '42') 17 + assert_equal @result, @client.module_result('Qt-Calculator', 'main', date)
16 end 18 end
17 19
18 should 'get result history' do 20 should 'get result history' do