diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb index 967bd82..096d805 100644 --- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb +++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb @@ -20,10 +20,6 @@ class MezuroPlugin::ProjectContent < Article def project @project ||= Kalibro::Client::ProjectClient.project(name) end - - def project - @project ||= Kalibro::Client::ProjectClient.project(name) - end def project_result @project_result ||= Kalibro::Client::ProjectResultClient.last_result(name) diff --git a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb index 934fdf6..6390bad 100644 --- a/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb +++ b/plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb @@ -44,15 +44,17 @@ class ProjectContentTest < ActiveSupport::TestCase end should 'get module result from service' do - module_name = 'My module name' - module_result = mock - module_result_client = mock - project_result = mock - @content.expects(:project_result).returns(project_result) + Kalibro::Client::ProjectClient.expects(:project).with(@content.name).returns(@project) + + project_result = mock project_result.expects(:date).returns('12/04/2012') - @content.expects(:module_result_client).returns(module_result_client) - module_result_client.expects(:module_result).with(@project.name, module_name, '12/04/2012'). - returns(module_result) + Kalibro::Client::ProjectResultClient.expects(:last_result).with(@content.name).returns(project_result) + + module_name = 'My module name' + module_result_client = mock + module_result = Kalibro::Entities::ModuleResult.new + Kalibro::Client::ModuleResultClient.expects(:new).returns(module_result_client) + module_result_client.expects(:module_result).with(@project.name, module_name, '12/04/2012').returns(module_result) assert_equal module_result, @content.module_result(module_name) end -- libgit2 0.21.2