From 1624388af6bb76472ffe34c2c6151841963d5111 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Sat, 31 May 2014 14:20:46 -0700 Subject: [PATCH] Fix tests --- test/test_web.rb | 3 ++- web/views/busy.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_web.rb b/test/test_web.rb index 68f78066..d910578e 100644 --- a/test/test_web.rb +++ b/test/test_web.rb @@ -282,7 +282,7 @@ class TestWeb < Sidekiq::Test Sidekiq.redis do |conn| pro = 'foo:1234' conn.sadd('processes', pro) - conn.hmset(pro, 'info', Sidekiq.dump_json('started_at' => Time.now.to_f), 'busy', 1, 'beat', Time.now.to_f) + conn.hmset(pro, 'info', Sidekiq.dump_json('started_at' => Time.now.to_f, 'labels' => ['frumduz']), 'busy', 1, 'beat', Time.now.to_f) identity = "#{pro}:workers" hash = {:queue => 'critical', :payload => { 'class' => "FailWorker", 'args' => ["hello"] }, :run_at => Time.now.to_i } conn.hmset(identity, 100001, Sidekiq.dump_json(hash)) @@ -292,6 +292,7 @@ class TestWeb < Sidekiq::Test get '/busy' assert_equal 200, last_response.status assert_match(/FailWorker/, last_response.body) + assert_match(/frumduz/, last_response.body) assert last_response.body.include?( "<a>hello</a>" ) assert !last_response.body.include?( "hello" ) diff --git a/web/views/busy.erb b/web/views/busy.erb index 3075ef25..78c49139 100644 --- a/web/views/busy.erb +++ b/web/views/busy.erb @@ -25,7 +25,7 @@ <%= "#{process['hostname']}:#{process['pid']}" %> - <% process['labels'].each do |label| %> + <% Array(process['labels']).each do |label| %> <%= label %> <% end %>