From 18bac9aa23ae320bf4e2237b81d24a55b39daac0 Mon Sep 17 00:00:00 2001
From: Carlos Morais <carlos88morais@gmail.com>
Date: Fri, 17 Feb 2012 21:18:37 -0200
Subject: [PATCH] [Mezuro] Changing controller actions order

---
 plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb          | 26 +++++++++++++-------------
 plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb | 38 +++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
index f78429a..f6ac0f1 100644
--- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
+++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
@@ -2,16 +2,11 @@ class MezuroPluginProfileController < ProfileController
 
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
 
-  def module_result
-    content = profile.articles.find(params[:id])
-    module_result = content.module_result(params[:module_name])
-    render :partial => 'content_viewer/module_result', :locals => { :module_result =>  module_result}
-  end
-
-  def project_result
+  def project_state
     content = profile.articles.find(params[:id])
-    project_result = content.project_result
-    render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result }
+    project = content.project
+    state = project.error.nil? ? project.state : "ERROR"
+    render :text => state
   end
 
   def project_error
@@ -20,11 +15,16 @@ class MezuroPluginProfileController < ProfileController
     render :partial => 'content_viewer/project_error', :locals => { :project => project }
   end
 
-  def project_state
+  def project_result
     content = profile.articles.find(params[:id])
-    project = content.project
-    state = project.error.nil? ? project.state : "ERROR"
-    render :text => state
+    project_result = content.project_result
+    render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result }
+  end
+
+  def module_result
+    content = profile.articles.find(params[:id])
+    module_result = content.module_result(params[:module_name])
+    render :partial => 'content_viewer/module_result', :locals => { :module_result =>  module_result}
   end
 
 end
diff --git a/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb b/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
index 33e2d2d..3ca5c3f 100644
--- a/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
+++ b/plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
@@ -23,28 +23,21 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase
     assert_response 404
   end
 
-  should 'get metric results for a module' do
-    create_project_content
-    Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @name).returns(@module_result)
-    get :module_result, :profile => @profile.identifier, :id => @content.id, :module_name => @name
-    assert_response 200
-    assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)')
-  end
-
-  should 'get project results' do
+  should 'get project state' do
     create_project_content
-    Kalibro::Client::ProjectResultClient.expects(:last_result).with(@name).returns(@project_result)
-    get :project_result, :profile => @profile.identifier, :id => @content.id
+    Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project)
+    get :project_state, :profile => @profile.identifier, :id => @content.id
     assert_response 200
-    assert_select('h3', 'LAST RESULT')
+    assert_equal @project.state, @response.body
   end
 
-  should 'get project state' do
+  should 'get error state if project has error' do
     create_project_content
     Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project)
+    @project.expects(:error).returns("")
     get :project_state, :profile => @profile.identifier, :id => @content.id
     assert_response 200
-    assert_equal @project.state, @response.body
+    assert_equal "ERROR", @response.body
   end
 
   should 'get project error' do
@@ -56,13 +49,20 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase
     assert_select('h3', 'ERROR')
   end
 
-  should 'get error state if project has error' do
+  should 'get project results' do
     create_project_content
-    Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project)
-    @project.expects(:error).returns("")
-    get :project_state, :profile => @profile.identifier, :id => @content.id
+    Kalibro::Client::ProjectResultClient.expects(:last_result).with(@name).returns(@project_result)
+    get :project_result, :profile => @profile.identifier, :id => @content.id
     assert_response 200
-    assert_equal "ERROR", @response.body
+    assert_select('h3', 'LAST RESULT')
+  end
+
+  should 'get metric results for a module' do
+    create_project_content
+    Kalibro::Client::ModuleResultClient.expects(:module_result).with(@content, @name).returns(@module_result)
+    get :module_result, :profile => @profile.identifier, :id => @content.id, :module_name => @name
+    assert_response 200
+    assert_select('h5', 'Metric results for: Qt-Calculator (APPLICATION)')
   end
 
   private
--
libgit2 0.21.2