From 1bd30704489121887fe458a551e7f47a298af13c Mon Sep 17 00:00:00 2001 From: João M. M. da Silva + Alessandro Palmeira Date: Tue, 4 Dec 2012 18:00:10 -0200 Subject: [PATCH] [Mezuro] Fixed Repository when kalibro has just a repository in a project --- plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb | 1 + plugins/mezuro/lib/kalibro/repository.rb | 5 ++++- plugins/mezuro/test/unit/kalibro/repository_test.rb | 1 + plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb index 8185616..3cb1ebf 100644 --- a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb +++ b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb @@ -68,6 +68,7 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController if( repository.errors.empty? ) redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}" else + raise repository.errors[0].message redirect_to_error_page repository.errors[0].message end end diff --git a/plugins/mezuro/lib/kalibro/repository.rb b/plugins/mezuro/lib/kalibro/repository.rb index 6746736..4bd24e3 100644 --- a/plugins/mezuro/lib/kalibro/repository.rb +++ b/plugins/mezuro/lib/kalibro/repository.rb @@ -11,7 +11,10 @@ class Kalibro::Repository < Kalibro::Model end def self.repositories_of(project_id) - request(:repositories_of, {:project_id => project_id})[:repository].to_a.map { |repository| new repository } + response = request(:repositories_of, {:project_id => project_id})[:repository] + response = [] if response.nil? + response = [response] if response.is_a? (Hash) + response.map {|repository| new repository} end def process_repository diff --git a/plugins/mezuro/test/unit/kalibro/repository_test.rb b/plugins/mezuro/test/unit/kalibro/repository_test.rb index e248417..14b8b77 100644 --- a/plugins/mezuro/test/unit/kalibro/repository_test.rb +++ b/plugins/mezuro/test/unit/kalibro/repository_test.rb @@ -40,6 +40,7 @@ class RepositoryTest < ActiveSupport::TestCase id_from_kalibro = 1 project_id = 56 Kalibro::Repository.expects(:request).with(:save_repository, {:repository => @created_repository.to_hash, :project_id => project_id}).returns(:repository_id => id_from_kalibro) + Kalibro::Repository.expects(:request).with(:process_repository, :repository_id => id_from_kalibro).returns(:repository_id => id_from_kalibro) assert @created_repository.save(project_id) assert_equal id_from_kalibro, @created_repository.id end diff --git a/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb b/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb index 916535c..db1176d 100644 --- a/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb +++ b/plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb @@ -10,7 +10,7 @@ class ContentViewerHelperTest < ActiveSupport::TestCase end should 'create the periodicity options array' do - assert_equal [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]], MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options + assert_equal [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]], MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options end should 'format metric name for metric configuration snapshot' do -- libgit2 0.21.2