From 06744385478af0b24b46eacfa05c45cbbf206ec0 Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + Diego Araujo Date: Wed, 19 Dec 2012 17:16:26 +0000 Subject: [PATCH] [Mezuro] Refactored the processing of a repository --- plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb | 1 + plugins/mezuro/lib/kalibro/repository.rb | 3 +-- plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb | 1 + plugins/mezuro/test/unit/kalibro/repository_test.rb | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb index aea2d07..daf235f 100644 --- a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb +++ b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb @@ -21,6 +21,7 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController repository.save(project_content.project_id) if( repository.errors.empty? ) + repository.process redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}" else redirect_to_error_page repository.errors[0].message diff --git a/plugins/mezuro/lib/kalibro/repository.rb b/plugins/mezuro/lib/kalibro/repository.rb index 08c1df4..f2a5cd8 100644 --- a/plugins/mezuro/lib/kalibro/repository.rb +++ b/plugins/mezuro/lib/kalibro/repository.rb @@ -17,7 +17,7 @@ class Kalibro::Repository < Kalibro::Model response.map {|repository| new repository} end - def process_repository + def process self.class.request(:process_repository, {:repository_id => self.id}) end @@ -28,7 +28,6 @@ class Kalibro::Repository < Kalibro::Model def save(project_id) begin self.id = self.class.request(:save_repository, {:repository => self.to_hash, :project_id => project_id})[:repository_id] - process_repository true rescue Exception => exception add_error exception diff --git a/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb b/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb index 7e4cc07..587f3a5 100644 --- a/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb +++ b/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb @@ -40,6 +40,7 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase should 'create a repository' do Kalibro::Repository.expects(:new).returns(@repository) @repository.expects(:save).with(@content.project_id).returns(true) + @repository.expects(:process) get :create, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash assert @repository.errors.empty? assert_response :redirect diff --git a/plugins/mezuro/test/unit/kalibro/repository_test.rb b/plugins/mezuro/test/unit/kalibro/repository_test.rb index 14b8b77..9d2c7ad 100644 --- a/plugins/mezuro/test/unit/kalibro/repository_test.rb +++ b/plugins/mezuro/test/unit/kalibro/repository_test.rb @@ -40,7 +40,6 @@ 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 @@ -59,7 +58,7 @@ class RepositoryTest < ActiveSupport::TestCase should 'process repository' do Kalibro::Repository.expects(:request).with(:process_repository, {:repository_id => @repository.id}); - @repository.process_repository + @repository.process end should 'cancel processing of a repository' do -- libgit2 0.21.2