From 8dd8155552ca44509d6df2cbe42ab8952f84ea74 Mon Sep 17 00:00:00 2001 From: Brandon Hilkert Date: Sun, 2 Dec 2012 23:18:31 -0500 Subject: [PATCH] Don't use separate module for web helper. --- lib/sidekiq/web.rb | 13 ++++--------- test/test_web.rb | 5 ++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb index a3dea0e7..db1dd359 100644 --- a/lib/sidekiq/web.rb +++ b/lib/sidekiq/web.rb @@ -2,18 +2,9 @@ require 'sinatra/base' require 'slim' require 'sidekiq/paginator' -module Sidekiq - module Helpers - def job_params(job, score) - "#{score}-#{job['jid']}" - end - end -end - module Sidekiq class Web < Sinatra::Base include Sidekiq::Paginator - include Sidekiq::Helpers dir = File.expand_path(File.dirname(__FILE__) + "/../../web") set :public_folder, "#{dir}/assets" @@ -95,6 +86,10 @@ module Sidekiq %{} end + def job_params(job, score) + "#{score}-#{job['jid']}" + end + def parse_params(params) score, jid = params.split("-") [score.to_f, jid] diff --git a/test/test_web.rb b/test/test_web.rb index 85afffa5..2e446274 100644 --- a/test/test_web.rb +++ b/test/test_web.rb @@ -6,12 +6,15 @@ require 'rack/test' class TestWeb < MiniTest::Unit::TestCase describe 'sidekiq web' do include Rack::Test::Methods - include Sidekiq::Helpers def app Sidekiq::Web end + def job_params(job, score) + "#{score}-#{job['jid']}" + end + before do Sidekiq.redis = REDIS Sidekiq.redis {|c| c.flushdb }