Merge branch 'refactoring_repository' into refactoring_processing

João M. M. da Silva
2 parents 8d632aba 63ab22be
Showing 5 changed files with 81 additions and 70 deletions Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
plugins/mezuro/public/javascripts/processing.js
plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
-#TODO terminar esse controler e seus testes funcionais
 class MezuroPluginRepositoryController < MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
@@ -55,18 +54,18 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
     end
   end
-  def show #TODO verificar data_content e data_profile
+  def show 
     project_content = profile.articles.find(params[:id])
     @project_name = project_content.name
-    @repository = project_content.repositories.select{ |repository| repository.id == params[:repository_id].to_s }.first
+    @repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
     @configuration_name = Kalibro::Configuration.configuration_of(@repository.id).name
     @data_profile = project_content.profile.identifier
     @data_content = project_content.id
   end
-  def destroy #TODO verificar se está correto
+  def destroy
     project_content = profile.articles.find(params[:id])
-    repository = project_content.repositories.select{ |repository| repository.id == params[:repository_id].to_s }.first
+    repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
     repository.destroy
     if( repository.errors.empty? )
       redirect_to "/#{profile.identifier}/#{project_content.name.downcase.gsub(/\s/, '-')}"
@@ -2,17 +2,18 @@ var processingTree = false;
 var metricName;
 jQuery(function (){
   jQuery('.source-tree-link').live("click", reloadModule);
-  jQuery('[show-metric-history]').live("click", display_metric_history);
-  jQuery('[show-grade-history]').live("click", display_grade_history);
-  jQuery('#project_date_submit').live("click", reloadProjectWithDate);
+  jQuery('[show-metric-history]').live("click", display_metric_history); //TODO review for project history
+  jQuery('[show-grade-history]').live("click", display_grade_history); //TODO review for project history
+  jQuery('#project_date_submit').live("click", reloadProjectWithDate); //TODO review for project history
   showLoadingProcess(true);
   showProcessing();
 });
 function showProcessing() {
-  callAction('processing', 'processing_state', {}, showProcessingFor);
+  callAction('processing', 'processing', {}, showProcessingFor);
 }
+//TODO review for project history
 function display_metric_history() {
   var module_name = jQuery(this).attr('data-module-name');
   var metric_name = jQuery(this).attr('show-metric-history');
@@ -22,6 +23,7 @@ function display_metric_history() {
   return false;
 }
+//TODO review for project history
 function display_grade_history() {
   var module_name = jQuery(this).attr('data-module-name');
   toggle_mezuro("#historical-grade");
@@ -29,10 +31,12 @@ function display_grade_history() {
   return false;
 }
+//TODO review for project history
 function show_metrics(content) {
   jQuery('#historical-' + metricName).html(content);
 }
+//TODO review for project history
 function show_grades(content) {
   jQuery('#historical-grade').html(content);
 }
@@ -42,6 +46,7 @@ function toggle_mezuro(element){
   return false;
 }
+//TODO Waiting for ModuleResultController refactoring
 function reloadModule(){
   var results_root_id = jQuery(this).attr('results_root_id');
   showLoadingProcess(false);
@@ -51,11 +56,13 @@ function reloadModule(){
   return false;
 }
+//TODO review for project history
 function reloadProjectWithDate(date){
 	reloadProject(date + "T00:00:00+00:00");
   return false;
 }
+//TODO review for project history
 function reloadProject(date){
   showLoadingProcess(true);
@@ -73,9 +80,9 @@ function showProcessingFor(state){
     jQuery('#msg-time').html('');
     jQuery('#processing-state').html('<div style="color:Green">READY</div>');
     callAction('processing', 'processing', {}, showProcessing);
-    callAction('module_result','project_tree', {}, showProjectTree);
-    var module_result_id = jQuery("#processing").attr('results_root_id');
-    callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult);
+    callAction('processing','project_tree', {}, showProjectTree);
+    //var module_result_id = jQuery("#processing").attr('results_root_id'); //TODO Waiting for ModuleResultController refactoring
+    //callAction('module_result', 'module_result', {module_result_id: module_result_id}, showModuleResult); //TODO Waiting for ModuleResultController refactoring
   } 
   else if (state.endsWith("ING")) {
     jQuery('#processing-state').html('<div style="color:DarkGoldenRod">'+ state +'</div>');
@@ -102,6 +109,7 @@ function showProjectTree(content){
 	return false;
 }
+//TODO Waiting for ModuleResultController refactoring
 function showModuleResult(content){
   if (processingTree != true){ 
     jQuery('#module-result').html(content);
@@ -6,7 +6,6 @@ require &quot;#{RAILS_ROOT}/plugins/mezuro/test/fixtures/repository_fixtures&quot;
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_content_fixtures"
 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
-#TODO terminar os testes
 class MezuroPluginRepositoryControllerTest < ActionController::TestCase
   def setup
@@ -87,14 +86,36 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     assert_response :redirect
   end
-  should 'set variables to show a repository' do #TODO Terminar esse teste
+  should 'set variables to show a repository' do
     Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
     Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration)
+    get :show, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
     assert_equal @content.name, assigns(:project_name)
     assert_equal @repository, assigns(:repository)
-#   @configuration_name = Kalibro::Configuration.find(@repository.configuration_id).name
-#   @processing = processing(@repository.id)
+    assert_equal @configuration.name, assigns(:configuration_name)
+    assert_equal @content.profile.identifier, assigns(:data_profile)
+    assert_equal @content.id, assigns(:data_content)
   end
+  should 'destroy a repository' do
+    @repository.expects(:destroy)    
+    Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
+
+    get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
+
+    assert @repository.errors.empty?
+    assert_response :redirect
+  end
+
+  should 'not destroy a repository' do
+    @repository.errors = [Exception.new]
+    @repository.expects(:destroy)    
+    Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
+
+    get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
+
+    assert !@repository.errors.empty?
+    assert_response :redirect
+  end
 end
@@ -4,39 +4,29 @@
   <%= hidden_field_tag :id, @project_content.id %>
   <%= f.hidden_field :id%>
-  <p>
-    <%= f.label :name, "Name:" %>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
+  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
-  <p>
-    <%= required labelled_form_field _('License'),
-    f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
-  </p>
+  <div class="formfieldline">
+    <%= f.label :description, "Description:", :class => 'formlabel' %>
+    <div class="formfield type-text">  
+      <%= f.text_field :description %>
+    </div>
+  </div>
-  <p>
-    <%= f.label :process_period, "Process Period:" %>
-    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
-  </p>
+  <%= required labelled_form_field _('License'),
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options, :selected => @repository.license) %>
-  <p>
-    <%= f.label :type, "Type:" %>
-    <%= f.select :type, @repository_types%>
-  </p>
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options, :selected => @repository.process_period.to_i) %>
-  <p>
-    <%= f.label :address, "Address:" %>
-    <%= f.text_field :address%>
-  </p>
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types, :selected => @repository.type) %>
-  <p>
-    <%= f.label :configuration_id, "Configuration:" %>
-    <%= f.select :configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i %>
-  </p>
+  <%= required labelled_form_field _('Address'),
+  f.text_field(:address) %>
+
+  <%= required labelled_form_field _('Configuration'),
+  f.select(:configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i) %>
   <p>
     <%= f.submit "Add" %>
@@ -3,36 +3,29 @@
 <% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
   <%= hidden_field_tag :id, @project_content.id %>
-  <p>
-    <%= f.label :name, "Name:" %>
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description, "Description:" %>
-    <%= f.text_field :description %>
-  </p>
+  <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
+
+  <div class="formfieldline">
+    <%= f.label :description, "Description:", :class => 'formlabel' %>
+    <div class="formfield type-text">  
+      <%= f.text_field :description %>
+    </div>
+  </div>
   <%= required labelled_form_field _('License'),
-  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %><br/>
-  <p>
-  
-  <p>
-    <%= f.label :process_period, "Process Period:" %>
-    <%= f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
-  </p>
-    <%= f.label :type, "Type:" %>
-    <%= f.select :type, @repository_types %>
-  </p>
+  f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
+
+  <%= required labelled_form_field _('Process Period'),
+  f.select(:process_period, MezuroPlugin::Helpers::ContentViewerHelper.periodicity_options ) %>
-  <p>
-    <%= f.label :address, "Address:" %>
-    <%= f.text_field :address %>
-  </p>
+  <%= required labelled_form_field _('Type'),
+  f.select(:type, @repository_types) %>
-  </p>
-    <%= f.label :configuration_id, "Configuration:" %>
-    <%= f.select :configuration_id, @configuration_select %>
-  </p>
+  <%= required labelled_form_field _('Address'),
+  f.text_field(:address) %>
+
+  <%= required labelled_form_field _('Configuration'),
+  f.select(:configuration_id, @configuration_select) %>
   <p>
     <%= f.submit "Add" %>
	@@ -6,7 +6,6 @@ require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/repository_fixtures"		@@ -6,7 +6,6 @@ require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/repository_fixtures"
6	require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_content_fixtures"	6	require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_content_fixtures"
7	require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"	7	require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
8		8
9	-#TODO terminar os testes
10	class MezuroPluginRepositoryControllerTest < ActionController::TestCase	9	class MezuroPluginRepositoryControllerTest < ActionController::TestCase
11		10
12	def setup	11	def setup
	@@ -87,14 +86,36 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase		@@ -87,14 +86,36 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase
87	assert_response :redirect	86	assert_response :redirect
88	end	87	end
89		88
90	- should 'set variables to show a repository' do #TODO Terminar esse teste	89	+ should 'set variables to show a repository' do
91	Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])	90	Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
92	Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration)	91	Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration)
93		92
		93	+ get :show, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
94	assert_equal @content.name, assigns(:project_name)	94	assert_equal @content.name, assigns(:project_name)
95	assert_equal @repository, assigns(:repository)	95	assert_equal @repository, assigns(:repository)
96	-# @configuration_name = Kalibro::Configuration.find(@repository.configuration_id).name
97	-# @processing = processing(@repository.id)	96	+ assert_equal @configuration.name, assigns(:configuration_name)
		97	+ assert_equal @content.profile.identifier, assigns(:data_profile)
		98	+ assert_equal @content.id, assigns(:data_content)
98	end	99	end
99		100
		101	+ should 'destroy a repository' do
		102	+ @repository.expects(:destroy)
		103	+ Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
		104	+
		105	+ get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
		106	+
		107	+ assert @repository.errors.empty?
		108	+ assert_response :redirect
		109	+ end
		110	+
		111	+ should 'not destroy a repository' do
		112	+ @repository.errors = [Exception.new]
		113	+ @repository.expects(:destroy)
		114	+ Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
		115	+
		116	+ get :destroy, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
		117	+
		118	+ assert !@repository.errors.empty?
		119	+ assert_response :redirect
		120	+ end
100	end	121	end