From b4bae80eebe74c174a9243c628afe225149e3589 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Wed, 11 Jul 2018 16:57:06 -0700 Subject: [PATCH] Set config via env for dashboard spec --- lib/vmpooler/dashboard.rb | 2 +- spec/integration/dashboard_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/vmpooler/dashboard.rb b/lib/vmpooler/dashboard.rb index 046a1d9..b875465 100644 --- a/lib/vmpooler/dashboard.rb +++ b/lib/vmpooler/dashboard.rb @@ -7,7 +7,7 @@ module Vmpooler get '/dashboard/?' do erb :dashboard, locals: { - site_name: config[:config]['site_name'] || 'vmpooler' + site_name: ENV['SITE_NAME'] || config[:config]['site_name'] || 'vmpooler' } end end diff --git a/spec/integration/dashboard_spec.rb b/spec/integration/dashboard_spec.rb index 1616907..147ec46 100644 --- a/spec/integration/dashboard_spec.rb +++ b/spec/integration/dashboard_spec.rb @@ -23,6 +23,7 @@ describe Vmpooler::API do context '/dashboard/' do ENV['SITE_NAME'] = 'test pooler' + ENV['VMPOOLER_CONFIG'] = 'thing' before do get '/dashboard/'