sidekiq-failures 0.4.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbf773e3881e5c3f66679dc77ce221997c58442d
-  data.tar.gz: 8fde6abd64a06cd529e7bf523a8f018c68cd9900
+SHA256:
+  metadata.gz: 411bc0eb000e29f27b3d5afd27e39719c693df17ce7b08baace66e42f4b8c402
+  data.tar.gz: 88174d41395b3953bf089590775e8e34725c4f47109a379727df08c4331ad8d8
 SHA512:
-  metadata.gz: 61dc54a740b82bd9317bec3240468dcd9fdb30663cc2eea05c2368fb117c307e5eeb2979388309177fd7c5a1bec692997e041675d6bba5d11265e95d8492a069
-  data.tar.gz: 58fca490bba04d832220c1ee1689cb19adfb6a0b457d76fbd79f82b1171ace187990cd47147f3ac8c081bcf36453bb1aa0d858b923bdb2f91058048b27984050
+  metadata.gz: 90a60cb2e7b0e8dac73aa3cc188d81e4616354ecdc259bb82680fea63cf2e171e19ddb009f21b686ab95fe30fcb9b0090d45335aaaf16c4985d9770e584aa749
+  data.tar.gz: 76886912d60887ed578b1b9d2e3ac0b4824b0db0087d776f590ef6c2cf060ad543d331848173c4e0c285ce72789c315586a4bbea6ce7f8b777db9ea17a293057

data/.travis.yml

@@ -1,18 +1,18 @@
 language: ruby
+sudo: false
+cache: bundler
 services:
   - redis-server
 rvm:
-  - 1.9.3
-  - jruby-19mode
-  - 2.0.0
-  - 2.1
+  - jruby-9.1.6.0
+  - 2.2.4
+  - 2.3.0
+  - 2.4.0
 env:
   matrix:
-    - SIDEKIQ_VERSION="~> 2.16"
-    - SIDEKIQ_VERSION="~> 2.17"
-    - SIDEKIQ_VERSION="~> 3.0"
-    - SIDEKIQ_VERSION="~> 3.1"
+    - SIDEKIQ_VERSION="~> 4.0"
+    - SIDEKIQ_VERSION="~> 4.2"
+    - SIDEKIQ_VERSION="~> 5.0"
 matrix:
   allow_failures:
-    - rvm: 1.9.3
-    - rvm: jruby-19mode
+    - rvm: jruby-9.1.6.0 

data/CHANGELOG.md

@@ -1,16 +1,45 @@
 ## Unreleased
 
+## 1.0.1
+
+  * Add license config to the gemspec (#115 @reiz)
+  * Guard against failure error_message being `nil` (#122 @mcasper)
+  * Fix filtering failures with 0 results on Sidekiq Pro (#125 @substars)
+
+## 1.0.0
+
+  * WebUI improvements (@bbtfr)
+  * Use ActiveJob to display info when available (@dreyks)
+  * New locales (@ryohashimoto @gurgelrenan)
+  * Sidekiq 4 and higher compatibility (@davekrupinski )
+  * Sidekiq 5 fixes (@fidelisrafael)
+
+## 0.4.5
+
+  * Limit error message to 500 symbols (@antonzaytsev)
+  * Add conditional csrf_tag to each form instance (@JamesChevalier)
+
+## 0.4.4
+
+  * Add paging to bottom of the view (@czarneckid)
+  * Always display failure count reset button (@mikeastock)
+  * Fix overflow for large backtrace messages (@marciotrindade)
+
 ## 0.4.3
+
   * Handle numeric timestamps format (@krasnoukhov)
 
 ## 0.4.2
+
   * Bump sidekiq dependency to 2.16.0 (@davetoxa)
   * Handle legacy timestamps (@maltoe)
 
 ## 0.4.1
+
   * Restore compatibility for failed payloads created with 0.3.0
 
 ## 0.4.0
+
   * Bump sidekiq dependency to sidekiq >= 2.16.0
   * Introduce delete(all) / retry(all) (@spectator)
   * Fix Sidekiq 3 compatibility (@petergoldstein)
@@ -18,6 +47,7 @@
   * Explicitly require sidekiq/api (@krasnoukhov)
 
 ## 0.3.0
+
   * Bump sidekiq dependency to sidekiq >= 2.14.0
   * Remove slim templates and dependecy
   * Escape exception info when outputing to html
@@ -28,15 +58,18 @@
   * Fix private method call (@bwthomas)
 
 ## 0.2.2
+
   * Support ERB for sidekiq >= 2.14.0 (@tobiassvn)
   * Bump sidekiq dep to >= 2.9.0
   * Show newest failures first (@PlugIN73)
   * Fix specs (@krasnoukhov)
 
 ## 0.2.1
+
   * Fix exhausted mode when retry is disabled (@wr0ngway)
 
 ## 0.2.0
+
   * Added processor identity to failure data (@krasnoukhov)
   * Handle Sidekiq::Shutdown exceptions (@krasnoukhov)
   * Add failures maximum count option (@mathieulaporte)
@@ -45,6 +78,7 @@
   * Stop overloading find_template (@zquestz)
 
 ## 0.1.0
+
   * Allow per worker configuration of failure tracking mode. Thanks to
     @kbaum for most of the work.
   * Prevent sidekiq-failures from loading up sidekiq/processor (and thus

data/Gemfile

@@ -4,3 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sidekiq', ENV['SIDEKIQ_VERSION'] if ENV['SIDEKIQ_VERSION']
+
+# to test Pro-specific functionality, set SIDEKIQ_PRO_CREDS on `bundle install`
+# and SIDEKIQ_PRO_VERSION on `bundle install` and `rake test`
+source "https://#{ENV['SIDEKIQ_PRO_CREDS']}@enterprise.contribsys.com/" do    
+    gem 'sidekiq-pro', ENV['SIDEKIQ_PRO_VERSION'] if ENV['SIDEKIQ_PRO_VERSION']
+end if ENV['SIDEKIQ_PRO_VERSION']

data/README.md

@@ -136,7 +136,7 @@ Sidekiq::Failures.reset_failures
 
 ## Dependencies
 
-Depends on Sidekiq >= 2.16.0
+Depends on Sidekiq >= 4.0.0
 
 ## Contributing
 

data/lib/sidekiq/failures.rb

@@ -5,6 +5,7 @@ rescue LoadError
 end
 
 require "sidekiq/api"
+require "sidekiq/version"
 require "sidekiq/failures/version"
 require "sidekiq/failures/sorted_entry"
 require "sidekiq/failures/failure_set"
@@ -47,9 +48,11 @@ module Sidekiq
 
   # Fetches the failures max count value
   def self.failures_max_count
-    return 1000 if @failures_max_count.nil?
-
-    @failures_max_count
+    if !instance_variable_defined?(:@failures_max_count) || @failures_max_count.nil?
+      1000
+    else
+      @failures_max_count
+    end
   end
 
   module Failures
@@ -62,12 +65,23 @@ module Sidekiq
     def self.count
       Sidekiq.redis {|r| r.zcard(LIST_KEY) }
     end
+
+    def self.retry_middleware_class
+      if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('5.0.0')
+        require 'sidekiq/job_retry'
+        Sidekiq::JobRetry
+      else
+        require 'sidekiq/middleware/server/retry_jobs'
+        Sidekiq::Middleware::Server::RetryJobs
+      end
+    end
+
   end
 end
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.insert_before Sidekiq::Middleware::Server::RetryJobs,
+    chain.insert_before Sidekiq::Failures.retry_middleware_class,
                         Sidekiq::Failures::Middleware
   end
 end

data/lib/sidekiq/failures/locales/ja.yml

@@ -0,0 +1,6 @@
+# encoding: utf-8
+ja:
+  FailedJobs: 失敗したジョブ
+  FailedAt: 失敗した日時
+  ResetCounter: カウンターをリセット
+  NoFailedJobsFound: 失敗したジョブはありません

data/lib/sidekiq/failures/locales/pt-BR.yml

@@ -0,0 +1,5 @@
+pt-BR:
+  FailedJobs: Processos Falhos
+  FailedAt: Falhou em
+  ResetCounter: Resetar contador
+  NoFailedJobsFound: Nenhum Processo falho encontrado

data/lib/sidekiq/failures/middleware.rb

@@ -80,11 +80,12 @@ module Sidekiq
       end
 
       def retry_middleware
-        @retry_middleware ||= Sidekiq::Middleware::Server::RetryJobs.new
+        @retry_middleware ||=
+          Sidekiq::Failures.retry_middleware_class.new
       end
 
       def default_max_retries
-        Sidekiq::Middleware::Server::RetryJobs::DEFAULT_MAX_RETRY_ATTEMPTS
+        Sidekiq::Failures.retry_middleware_class::DEFAULT_MAX_RETRY_ATTEMPTS
       end
 
       def hostname

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.4.3"
+    VERSION = "1.0.1"
   end
 end

data/lib/sidekiq/failures/views/failure.erb

@@ -24,6 +24,7 @@
   </tbody>
 </table>
 <form class="form-horizontal" action="<%= root_path %>failures/<%= job_params(@failure, @failure.score) %>" method="post">
+  <%= csrf_tag if respond_to?(:csrf_tag) %>
   <a class="btn" href="<%= root_path %>failures"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

data/lib/sidekiq/failures/views/failures.erb

@@ -2,7 +2,7 @@
   <div class="col-sm-5">
     <h3><%= t('FailedJobs') %></h3>
   </div>
-  <% if @failures.size > 0 && @total_size > @count %>
+  <% if @failures.count > 0 && @total_size > @count %>
     <div class="col-sm-4">
       <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
     </div>
@@ -10,8 +10,9 @@
   <%= filtering('failures') if respond_to?(:filtering) %>
 </header>
 
-<% if @failures.size > 0 %>
+<% if @failures.count > 0 %>
   <form action="<%= root_path %>failures" method="post">
+    <%= csrf_tag if respond_to?(:csrf_tag) %>
     <table class="table table-striped table-bordered table-white">
       <thead>
         <tr>
@@ -20,11 +21,11 @@
               <input type="checkbox" class="check_all" />
             </label>
           </th>
-          <th style="width: 20%"><%= t('Worker') %></th>
-          <th style="width: 10%"><%= t('Arguments') %></th>
-          <th style="width: 10%"><%= t('Queue') %></th>
-          <th style="width: 10%"><%= t('FailedAt') %></th>
-          <th style="width: 50%"><%= t('Error') %></th>
+          <th><%= t('FailedAt') %></th>
+          <th><%= t('Queue') %></th>
+          <th><%= t('Worker') %></th>
+          <th><%= t('Arguments') %></th>
+          <th><%= t('Error') %></th>
         </tr>
       </thead>
       <% @failures.each do |entry| %>
@@ -34,19 +35,19 @@
               <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
             </label>
           </td>
-          <td><a href="<%= root_path %>failures/<%= job_params(entry.item, entry.score) %>"><%= entry.klass %></a></td>
+          <td><a href="<%= root_path %>failures/<%= job_params(entry.item, entry.score) %>"><%= safe_relative_time(entry['failed_at']) %></a></td>
           <td>
-            <div class="args"><%= display_args(entry.args) %></div>
+            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
+          <td><%= entry.respond_to?(:display_class) ? entry.display_class : entry.klass %></td>
           <td>
-            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
+            <div class="args"><%= display_args(entry.respond_to?(:display_args) ? entry.display_args : entry.args) %></div>
           </td>
-          <td><%= safe_relative_time(entry['failed_at']) %></td>
           <td style="overflow: auto; padding: 10px;">
             <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">
-              <%= h entry['error_class'] %>: <%= h entry['error_message'] %>
+              <%= h entry['error_class'] %>: <%= h entry['error_message'].to_s.size > 500 ? entry['error_message'][0..500] + '...' : entry['error_message'] %>
             </a>
-            <pre style="display: none; background: none; border: 0; width: 100%; max-height: 30em; font-size: 0.8em; white-space: nowrap;">
+            <pre style="display: none; background: none; border: 0; width: 100%; max-height: 30em; font-size: 0.8em; white-space: nowrap; overflow: auto;">
               <%= entry['error_backtrace'].join("<br />") if entry['error_backtrace'] %>
             </pre>
             <p>
@@ -60,16 +61,25 @@
     <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
   </form>
 
-  <form action="<%= root_path %>failures/all/reset" method="post">
-    <input class="btn btn-danger btn-xs pull-right" type="submit" name="reset" value="<%= t('Reset Counter') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </form>
   <form action="<%= root_path %>failures/all/delete" method="post">
+    <%= csrf_tag if respond_to?(:csrf_tag) %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
   <form action="<%= root_path %>failures/all/retry" method="post">
+    <%= csrf_tag if respond_to?(:csrf_tag) %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 
+  <% if @failures.count > 0 && @total_size > @count %>
+    <div class="col-sm-4">
+      <%= erb :_paging, :locals => { :url => "#{root_path}failures" } %>
+    </div>
+  <% end %>
+
 <% else %>
   <div class="alert alert-success"><%= t('NoFailedJobsFound') %></div>
 <% end %>
+<form action="<%= root_path %>failures/all/reset" method="post">
+  <%= csrf_tag if respond_to?(:csrf_tag) %>
+  <input class="btn btn-danger btn-xs pull-right" type="submit" name="reset" value="<%= t('Reset Counter') %>" data-confirm="<%= t('AreYouSure') %>" />
+</form>

data/lib/sidekiq/failures/web_extension.rb

@@ -19,7 +19,7 @@ module Sidekiq
 
         app.get "/failures" do
           @count = (params[:count] || 25).to_i
-          (@current_page, @total_size, @failures) = page(LIST_KEY, params[:page], @count)
+          (@current_page, @total_size, @failures) = page(LIST_KEY, params[:page], @count, :reverse => true)
           @failures = @failures.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
 
           render(:erb, File.read(File.join(view_path, "failures.erb")))
@@ -78,6 +78,17 @@ module Sidekiq
           FailureSet.new.retry_all_failures
           redirect "#{root_path}failures"
         end
+
+        app.get '/filter/failures' do
+          redirect "#{root_path}failures"
+        end
+
+        app.post '/filter/failures' do
+          @failures = Sidekiq::Failures::FailureSet.new.scan("*#{params[:substr]}*")
+          @current_page = 1
+          @count = @total_size = @failures.count          
+          render(:erb, File.read(File.join(view_path, "failures.erb")))
+        end
       end
     end
   end

data/sidekiq-failures.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Keep track of Sidekiq failed jobs}
   gem.summary       = %q{Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you browse them. Makes use of Sidekiq's custom tabs and middleware chain.}
   gem.homepage      = "https://github.com/mhfs/sidekiq-failures/"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,8 +16,16 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::Failures::VERSION
 
-  gem.add_dependency "sidekiq", ">= 2.16.0"
+  gem.add_dependency "sidekiq", ">= 4.0.0"
 
+  # Redis 4.X is incompatible with Ruby < 2.3, but the Ruby version constraint
+  # wasn't added until 4.1.2, meaning you can get an incompatible version of the
+  # redis gem when running Ruby 2.2 without this constraint.
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
+    gem.add_dependency "redis", "< 4.0"
+  end
+
+  gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rack-test"
   gem.add_development_dependency "sprockets"

data/test/failures_test.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+module Sidekiq
+  describe Failures do
+    describe '.retry_middleware_class' do
+      it 'returns based on Sidekiq::VERISON' do
+        case Sidekiq::VERSION[0]
+        when '5'
+          assert_equal Failures.retry_middleware_class, Sidekiq::JobRetry
+        when '4'
+          assert_equal Failures.retry_middleware_class, Sidekiq::Middleware::Server::RetryJobs
+        end
+      end
+    end
+  end
+end

data/test/middleware_test.rb

@@ -4,9 +4,9 @@ module Sidekiq
   module Failures
     describe "Middleware" do
       before do
-        Celluloid.boot
         $invokes = 0
         @boss = MiniTest::Mock.new
+        num_options_calls.times { @boss.expect(:options, {:queues => ['default'] }, []) }
         @processor = ::Sidekiq::Processor.new(@boss)
         Sidekiq.server_middleware {|chain| chain.add Sidekiq::Failures::Middleware }
         Sidekiq.redis = REDIS
@@ -44,7 +44,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -62,7 +62,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -80,8 +80,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
-        2.times { @boss.expect(:async, actor, []) }
+        actor.expect(:real_thread, nil, [nil, nil])
 
         @processor.process(msg)
         @boss.verify
@@ -97,7 +96,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -117,7 +116,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -136,7 +135,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -154,7 +153,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -172,7 +171,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -192,7 +191,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -212,7 +211,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         2.times { @boss.expect(:async, actor, []) }
 
         assert_raises TestException do
@@ -233,11 +232,12 @@ module Sidekiq
 
         3.times do
           boss = MiniTest::Mock.new
+          num_options_calls.times { boss.expect(:options, {:queues => ['default'] }, []) }
           processor = ::Sidekiq::Processor.new(boss)
 
           actor = MiniTest::Mock.new
           actor.expect(:processor_done, nil, [processor])
-          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          actor.expect(:real_thread, nil, [nil, nil])
           2.times { boss.expect(:async, actor, []) }
 
           assert_raises TestException do
@@ -261,7 +261,7 @@ module Sidekiq
 
         actor = MiniTest::Mock.new
         actor.expect(:processor_done, nil, [@processor])
-        actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+        actor.expect(:real_thread, nil, [nil, nil])
         @boss.expect(:async, actor, [])
 
         assert_raises TestException do
@@ -278,6 +278,14 @@ module Sidekiq
       def create_work(msg)
         Sidekiq::BasicFetch::UnitOfWork.new('default', Sidekiq.dump_json(msg))
       end
+
+      def num_options_calls
+        if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('5.0.3')
+          3
+        else
+          2
+        end
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
+$TESTING = true
 
 require "minitest/autorun"
 require "minitest/spec"
@@ -7,14 +6,13 @@ require "minitest/mock"
 
 require "rack/test"
 
-require "celluloid"
 require "sidekiq"
+require "sidekiq-pro" if ENV['SIDEKIQ_PRO_VERSION']
 require "sidekiq-failures"
 require "sidekiq/processor"
 require "sidekiq/fetch"
 require "sidekiq/cli"
 
-Celluloid.logger = nil
 Sidekiq.logger.level = Logger::ERROR
 
-REDIS = Sidekiq::RedisConnection.create(:url => "redis://localhost/15", :namespace => 'sidekiq_failures_test')
+REDIS = Sidekiq::RedisConnection.create(url: "redis://localhost/15")

data/test/web_extension_test.rb

@@ -5,11 +5,15 @@ module Sidekiq
   describe "WebExtension" do
     include Rack::Test::Methods
 
+    TOKEN = SecureRandom.base64(32).freeze
+
     def app
       Sidekiq::Web
     end
 
     before do
+      env 'rack.session', { csrf: TOKEN }
+      env 'HTTP_X_CSRF_TOKEN', TOKEN
       Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
@@ -18,15 +22,21 @@ module Sidekiq
       get '/'
 
       last_response.status.must_equal 200
-      last_response.body.must_match /Sidekiq/
-      last_response.body.must_match /Failures/
+      last_response.body.must_match(/Sidekiq/)
+      last_response.body.must_match(/Failures/)
     end
 
     it 'can display failures page without any failures' do
       get '/failures'
       last_response.status.must_equal 200
-      last_response.body.must_match /Failed Jobs/
-      last_response.body.must_match /No failed jobs found/
+      last_response.body.must_match(/Failed Jobs/)
+      last_response.body.must_match(/No failed jobs found/)
+    end
+
+    it 'has the reset counter form and action' do
+      get '/failures'
+      last_response.body.must_match(/failures\/all\/reset/)
+      last_response.body.must_match(/Reset Counter/)
     end
 
     describe 'when there are failures' do
@@ -40,66 +50,61 @@ module Sidekiq
       end
 
       it 'can display failures page with failures listed' do
-        last_response.body.must_match /Failed Jobs/
-        last_response.body.must_match /HardWorker/
-        last_response.body.must_match /ArgumentError/
-        last_response.body.wont_match /No failed jobs found/
-      end
-
-      it 'has the reset counter form and action' do
-        last_response.body.must_match /failures\/all\/reset/
-        last_response.body.must_match /Reset Counter/
+        last_response.body.must_match(/Failed Jobs/)
+        last_response.body.must_match(/HardWorker/)
+        last_response.body.must_match(/ArgumentError/)
+        last_response.body.wont_match(/No failed jobs found/)
       end
 
       it 'can reset counter' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         post '/failures/all/reset'
         last_response.status.must_equal 302
-        last_response.location.must_match /failures$/
+        last_response.location.must_match(/failures$/)
 
         get '/failures'
         last_response.status.must_equal 200
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         assert_equal failed_count, "0"
       end
 
       it 'has the delete all form and action' do
-        last_response.body.must_match /failures\/all\/delete/
-        last_response.body.must_match /Delete All/
+        last_response.body.must_match(/failures\/all\/delete/)
+        last_response.body.must_match(/Delete All/)
       end
 
       it 'can delete all failures' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         post '/failures/all/delete'
         last_response.status.must_equal 302
-        last_response.location.must_match /failures$/
+        last_response.location.must_match(/failures$/)
 
         get '/failures'
         last_response.status.must_equal 200
-        last_response.body.must_match /No failed jobs found/
+        last_response.body.must_match(/No failed jobs found/)
 
         assert_equal failed_count, "1"
       end
 
       it 'has the retry all form and action' do
-        last_response.body.must_match /failures\/all\/retry/
-        last_response.body.must_match /Retry All/
+        last_response.body.must_match(/failures\/all\/retry/)
+        last_response.body.must_match(/Retry All/)
       end
 
       it 'can retry all failures' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
         post '/failures/all/retry'
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
 
         get '/failures'
         last_response.status.must_equal 200
@@ -109,29 +114,37 @@ module Sidekiq
       it 'can delete failure from the list' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         post '/failures', { :key => [failure_score], :delete => 'Delete' }
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
 
         get '/failures'
         last_response.status.must_equal 200
-        last_response.body.must_match /No failed jobs found/
+        last_response.body.must_match(/No failed jobs found/)
       end
 
       it 'can retry failure from the list' do
         assert_equal failed_count, "1"
 
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         post '/failures', { :key => [failure_score], :retry => 'Retry Now' }
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
+
+        get '/failures'
+        last_response.status.must_equal 200
+        last_response.body.must_match(/No failed jobs found/)
+      end
+
+      it 'can handle failures with nil error_message' do
+        create_sample_failure(error_message: nil)
 
         get '/failures'
+
         last_response.status.must_equal 200
-        last_response.body.must_match /No failed jobs found/
       end
     end
 
@@ -146,34 +159,43 @@ module Sidekiq
       end
 
       it 'can display failure page' do
-        last_response.body.must_match /Job/
-        last_response.body.must_match /HardWorker/
-        last_response.body.must_match /ArgumentError/
-        last_response.body.must_match /file1/
+        last_response.body.must_match(/Job/)
+        last_response.body.must_match(/HardWorker/)
+        last_response.body.must_match(/ArgumentError/)
+        last_response.body.must_match(/file1/)
       end
 
       it 'can delete failure' do
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         post "/failures/#{failure_score}", :delete => 'Delete'
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
 
         get "/failures/#{failure_score}"
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
       end
 
       it 'can retry failure' do
-        last_response.body.must_match /HardWorker/
+        last_response.body.must_match(/HardWorker/)
 
         post "/failures/#{failure_score}", :retry => 'Retry Now'
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
 
         get "/failures/#{failure_score}"
         last_response.status.must_equal 302
-        last_response.location.must_match /failures/
+        last_response.location.must_match(/failures/)
+      end
+
+      if defined? Sidekiq::Pro
+        it 'can filter failure' do
+          create_sample_failure
+          post '/filter/failures', substr: 'new'
+
+          last_response.status.must_equal 200
+        end
       end
     end
 
@@ -185,11 +207,11 @@ module Sidekiq
         end
 
         it 'can escape arguments' do
-          last_response.body.must_match /"<h1>omg</h1>"/
+          last_response.body.must_match(/"<h1>omg</h1>"/)
         end
 
         it 'can escape error message' do
-          last_response.body.must_match /ArgumentError: <p>wow</p>/
+          last_response.body.must_match(/ArgumentError: <p>wow</p>/)
         end
       end
 
@@ -201,7 +223,7 @@ module Sidekiq
 
         it 'should be successful' do
           last_response.status.must_equal 200
-          last_response.body.wont_match /No failed jobs found/
+          last_response.body.wont_match(/No failed jobs found/)
         end
       end
 
@@ -213,7 +235,7 @@ module Sidekiq
 
         it 'should be successful' do
           last_response.status.must_equal 200
-          last_response.body.wont_match /No failed jobs found/
+          last_response.body.wont_match(/No failed jobs found/)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Marcelo Silveira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +112,8 @@ files:
 - lib/sidekiq/failures.rb
 - lib/sidekiq/failures/failure_set.rb
 - lib/sidekiq/failures/locales/en.yml
+- lib/sidekiq/failures/locales/ja.yml
+- lib/sidekiq/failures/locales/pt-BR.yml
 - lib/sidekiq/failures/middleware.rb
 - lib/sidekiq/failures/sorted_entry.rb
 - lib/sidekiq/failures/version.rb
@@ -105,13 +121,15 @@ files:
 - lib/sidekiq/failures/views/failures.erb
 - lib/sidekiq/failures/web_extension.rb
 - sidekiq-failures.gemspec
+- test/failures_test.rb
 - test/middleware_test.rb
 - test/test_helper.rb
 - test/web_extension_test.rb
 homepage: https://github.com/mhfs/sidekiq-failures/
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,13 +144,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Keeps track of Sidekiq failed jobs and adds a tab to the Web UI to let you
   browse them. Makes use of Sidekiq's custom tabs and middleware chain.
 test_files:
+- test/failures_test.rb
 - test/middleware_test.rb
 - test/test_helper.rb
 - test/web_extension_test.rb