[Mezuro] found where to expect error in project content and in show_project and initiated test

Caio Salgado + Jefferson Fernandes · Caio
1 parent 6512befb
Showing 3 changed files with 26 additions and 12 deletions Show diff stats
plugins/mezuro/lib/mezuro_plugin/project_content.rb
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -14,7 +14,17 @@ class MezuroPlugin::ProjectContent &lt; Article
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
     lambda do
-      render :file => 'content_viewer/show_project.rhtml'
+      
+      render :file => 'content_viewer/show_project.rhtml', :locals => { :project => project_kalibro, :error_kalibro => error_kalibro }
+    end
+  end
+  
+  def rescue_error_kalibro
+    error_kalibro = false
+    begin
+      project_kalibro = project
+    rescue
+      error_kalibro = true
     end
   end
@@ -14,15 +14,6 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
     @content.repository_url = @project.repository.address
     @content.configuration_name = @project.configuration_name
     @content.periodicity_in_days = 1
-
-		@content2 = MezuroPlugin::ProjectContent.new
-		@content2.name = @content.name
-    @content2.license = @project.license
-    @content2.description = @project.description
-    @content2.repository_type = @project.repository.type
-    @content2.repository_url = @project.repository.address
-    @content2.configuration_name = @project.configuration_name
-    @content2.periodicity_in_days = 1
   end
   should 'be an article' do
@@ -40,6 +31,11 @@ class ProjectContentTest &lt; ActiveSupport::TestCase
   should 'have an html view' do
     assert_not_nil @content.to_html
   end
+  
+  should 'rescue error when project doesnt exist in kalibro' do
+    MezuroPlugin::ProjectContent.expects(:project).returns(create_project_error)
+    assert_equal true, @content.rescue_error_kalibro
+  end
   should 'get project from service' do
     Kalibro::Client::ProjectClient.expects(:project).with(@content.name).returns(@project)
@@ -107,6 +103,7 @@ returns(module_result)
 	end
   private
+
     def mock_project_client
       Kalibro::Client::ProjectClient.expects(:project).with(@content.name).returns(@project)
     end
@@ -117,4 +114,8 @@ returns(module_result)
       project_result
     end
+	  def create_project_error
+	      raise "Error on Kalibro" 
+	  end
+
 end
 <script src="/plugins/mezuro/javascripts/project_content.js" type="text/javascript"></script>
-
-<% @project = @page.project %>
+<% if error_kalibro %>
+  Projeto nao existe TODO: Perguntar oa usuário se deseja excluir o projeto do Noosfero
+<% else %>
+<% @project = project %>
 <table>
   <tr>
     <td><%= _('Name') %></td>
@@ -43,3 +45,4 @@
 <div id="project-tree"></div>
 <div id="module-result">
 </div>
+<% end %>
	@@ -14,7 +14,17 @@ class MezuroPlugin::ProjectContent < Article		@@ -14,7 +14,17 @@ class MezuroPlugin::ProjectContent < Article
14	include ActionView::Helpers::TagHelper	14	include ActionView::Helpers::TagHelper
15	def to_html(options = {})	15	def to_html(options = {})
16	lambda do	16	lambda do
17	- render :file => 'content_viewer/show_project.rhtml'	17	+
		18	+ render :file => 'content_viewer/show_project.rhtml', :locals => { :project => project_kalibro, :error_kalibro => error_kalibro }
		19	+ end
		20	+ end
		21	+
		22	+ def rescue_error_kalibro
		23	+ error_kalibro = false
		24	+ begin
		25	+ project_kalibro = project
		26	+ rescue
		27	+ error_kalibro = true
18	end	28	end
19	end	29	end
20		30