Download as
Browse Code »

Commit c72e0722a984621e4d7d78dbef8579feaa85a4f9

Authored by Alessandro Palmeira + Carlos Morais
Committed by Carlos Morais
1 parent 3a92026d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] Added partials in controller

Showing 2 changed files with 31 additions and 0 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @c72e072
@@ -14,6 +14,18 @@ class MezuroPluginProfileController < ProfileController @@ -14,6 +14,18 @@ class MezuroPluginProfileController < ProfileController
14 render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result } 14 render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result }
15 end 15 end
16 16
  17 + def project_error
  18 + content = profile.articles.find(params[:id])
  19 + project = content.project
  20 + render :partial => 'content_viewer/project_error', :locals => { :project => project }
  21 + end
  22 +
  23 + def project_processing
  24 + content = profile.articles.find(params[:id])
  25 + project = content.project
  26 + render :partial => 'content_viewer/project_processing', :locals => { :project => project }
  27 + end
  28 +
17 def project_state 29 def project_state
18 content = profile.articles.find(params[:id]) 30 content = profile.articles.find(params[:id])
19 project = content.project 31 project = content.project
plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
  Diff comments   View file @c72e072
@@ -2,6 +2,7 @@ require 'test_helper' @@ -2,6 +2,7 @@ require 'test_helper'
2 2
3 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_result_fixtures" 3 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/module_result_fixtures"
4 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_result_fixtures" 4 require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/project_result_fixtures"
  5 +require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/error_fixtures"
5 6
6 class MezuroPluginProfileControllerTest < ActionController::TestCase 7 class MezuroPluginProfileControllerTest < ActionController::TestCase
7 8
@@ -46,6 +47,24 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase @@ -46,6 +47,24 @@ class MezuroPluginProfileControllerTest &lt; ActionController::TestCase
46 assert_equal @project.state, @response.body 47 assert_equal @project.state, @response.body
47 end 48 end
48 49
  50 + should 'get project error' do
  51 + create_project_content
  52 + Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project)
  53 + @project.expects(:error).returns(ErrorFixtures.create)
  54 + get :project_error, :profile => @profile.identifier, :id => @content.id
  55 + assert_response 200
  56 + assert_select('h3', 'ERROR')
  57 + end
  58 +
  59 + should 'get project processing' do
  60 + create_project_content
  61 + Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project)
  62 + @project.expects(:state).returns("LOADING")
  63 + get :project_processing, :profile => @profile.identifier, :id => @content.id
  64 + assert_response 200
  65 + assert_select('h3', 'Service is loading Qt-Calculator...')
  66 + end
  67 +
49 should 'get error state if project has error' do 68 should 'get error state if project has error' do
50 create_project_content 69 create_project_content
51 Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project) 70 Kalibro::Client::ProjectClient.expects(:project).with(@name).returns(@project)