From be8632b763413689755c3a36d3801899becb090b Mon Sep 17 00:00:00 2001 From: Tomer Brisker Date: Tue, 1 Nov 2016 10:54:23 +0200 Subject: [PATCH] Fixes #17152 - Puppet proxy dashboard displays correctly --- app/controllers/smart_proxies_controller.rb | 7 ++----- test/controllers/smart_proxies_controller_test.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/smart_proxies_controller.rb b/app/controllers/smart_proxies_controller.rb index bfe01f5c975..cb7a423a71a 100644 --- a/app/controllers/smart_proxies_controller.rb +++ b/app/controllers/smart_proxies_controller.rb @@ -62,11 +62,8 @@ def puppet_environments end def puppet_dashboard - dashboard = Dashboard::Data.new("puppet_proxy_id = \"#{@smart_proxy.id}\"") - @hosts = dashboard.hosts - @report = dashboard.report - @latest_events = dashboard.latest_events - render :partial => 'smart_proxies/plugins/puppet_dashboard', :locals => { :dashboard => dashboard } + @data = Dashboard::Data.new("puppet_proxy_id = \"#{@smart_proxy.id}\"") + render :partial => 'smart_proxies/plugins/puppet_dashboard' rescue Foreman::Exception => exception process_ajax_error exception end diff --git a/test/controllers/smart_proxies_controller_test.rb b/test/controllers/smart_proxies_controller_test.rb index 6ab28556c2f..1e1c4c7421f 100644 --- a/test/controllers/smart_proxies_controller_test.rb +++ b/test/controllers/smart_proxies_controller_test.rb @@ -144,6 +144,14 @@ def test_refresh_fail assert @response.body.include?('5') #the total is correct end + test '#puppet_dashboard' do + proxy = smart_proxies(:puppetmaster) + xhr :get, :puppet_dashboard, { :id => proxy.id }, set_session_user + assert_response :success + assert_template 'smart_proxies/plugins/_puppet_dashboard' + assert @response.body.include? 'Latest Events' + end + test '#log_pane' do proxy = smart_proxies(:logs) fake_data = ::SmartProxies::LogBuffer.new(