Download as
Browse Code »

Commit c9b381b921f93881746dc0be693aaee5b0313811

Authored by Diego Camarinha
Committed by Paulo Meireles
1 parent 2066eea4
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[Mezuro] Refactored module_result_client and updated tests

Showing 4 changed files with 30 additions and 15 deletions   Show diff stats
plugins/mezuro/lib/kalibro/client/module_result_client.rb
  Diff comments   View file @c9b381b
1 1 class Kalibro::Client::ModuleResultClient
2 2  
3   - # TODO test this
4   - def self.module_result(project_content, module_name)
5   - project_result = project_content.project_result
6   - new.module_result(project_result.project.name, module_name, project_result.date)
7   - end
8   -
9 3 def initialize
10 4 @port = Kalibro::Client::Port.new('ModuleResult')
11 5 end
... ... @@ -23,4 +17,11 @@ class Kalibro::Client::ModuleResultClient
23 17 Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult)
24 18 end
25 19  
26   -end
27 20 \ No newline at end of file
  21 + private
  22 +
  23 + def date_with_milliseconds(date)
  24 + milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
  25 + date.to_s[0..18] + milliseconds + date.to_s[19..-1]
  26 + end
  27 +
  28 +end
... ...
plugins/mezuro/lib/mezuro_plugin/project_content.rb
  Diff comments   View file @c9b381b
... ... @@ -26,7 +26,12 @@ class MezuroPlugin::ProjectContent < Article
26 26 end
27 27  
28 28 def module_result(module_name)
29   - @module_client ||= Kalibro::Client::ModuleResultClient.module_result(self, module_name)
  29 + module_name = project.name if module_name.nil?
  30 + @module_client ||= module_result_client.module_result(project.name, module_name, project_result.date)
  31 + end
  32 +
  33 + def module_result_client
  34 + @module_result_client ||= Kalibro::Client::ModuleResultClient.new
30 35 end
31 36  
32 37 after_save :send_project_to_service
... ...
plugins/mezuro/test/unit/kalibro/client/module_result_client_test.rb
  Diff comments   View file @c9b381b
... ... @@ -26,5 +26,4 @@ class ModuleResultClientTest < ActiveSupport::TestCase
26 26 @port.expects(:request).with(:get_result_history, request_body).returns(response)
27 27 assert_equal [@result], @client.result_history('Qt-Calculator', 'main')
28 28 end
29   -
30   -end
31 29 \ No newline at end of file
  30 +end
... ...
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
  Diff comments   View file @c9b381b
... ... @@ -46,17 +46,27 @@ class ProjectContentTest < ActiveSupport::TestCase
46 46 should 'get module result from service' do
47 47 module_name = 'My module name'
48 48 module_result = mock
49   - Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, module_name).
  49 + module_result_client = mock
  50 + project_result = mock
  51 + @content.expects(:project_result).returns(project_result)
  52 + project_result.expects(:date).returns('12/04/2012')
  53 + @content.expects(:module_result_client).returns(module_result_client)
  54 + module_result_client.expects(:module_result).with(@project.name, module_name, '12/04/2012').
50 55 returns(module_result)
51 56 assert_equal module_result, @content.module_result(module_name)
52 57 end
53 58  
54   - should 'get module result root when project name is give' do
  59 + should 'get module result root when nil is given' do
55 60 module_result = mock
56   - Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @project.name).
  61 + module_result_client = mock
  62 + project_result = mock
  63 + @content.expects(:project_result).returns(project_result)
  64 + project_result.expects(:date).returns('12/04/2012')
  65 + @content.expects(:module_result_client).returns(module_result_client)
  66 + module_result_client.expects(:module_result).with(@project.name, @project.name, '12/04/2012').
57 67 returns(module_result)
58   - assert_equal module_result, @content.module_result(@project.name)
59   - end
  68 + assert_equal module_result, @content.module_result(nil)
  69 + end
60 70  
61 71 should 'send project to service after saving' do
62 72 @content.expects :send_project_to_service
... ...