sidekiq-undertaker 1.0.0.rc03 → 1.0.2

data/spec/sidekiq/undertaker/dead_jobs_spec.rb

@@ -50,7 +50,7 @@ module Sidekiq
 
       describe ".for_each" do
         let(:expected_dead_job) do
-          DeadJob.new(
+          described_class.new(
             job_class:                  "HardWorkTask",
             time_elapsed_since_failure: time_elapsed,
             error_class:                "NoMethodError",

data/spec/sidekiq/undertaker/job_distributor_spec.rb

@@ -66,7 +66,7 @@ module Sidekiq
 
       let(:dead_jobs) { [dead_job1, dead_job2, dead_job3, dead_job4] }
 
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       describe "#group_by_job_class" do
         subject(:distribution) { described_class.new(dead_jobs).group_by_job_class }
 
@@ -98,7 +98,7 @@ module Sidekiq
           expect(distribution).to eq expected_distribution
         end
       end
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
     end
   end
 end

data/spec/sidekiq/undertaker/job_filter_spec.rb

@@ -81,6 +81,7 @@ module Sidekiq
               expect(dead_job.error_class).to eq "NoMethodError"
             end
           end
+
           it { expect(dead_jobs.size).to eq 2 }
         end
 

data/spec/sidekiq/undertaker/web_extension_spec.rb

@@ -49,7 +49,7 @@ module Sidekiq
       after { Timecop.return }
 
       def add_dead(opts = {})
-        opts = default_job_opts.merge!(opts)
+        opts = default_job_opts.merge(opts)
 
         job = build_job(opts)
         killed_job = kill_job(job)
@@ -58,7 +58,7 @@ module Sidekiq
       end
 
       shared_examples "a page" do
-        it "the displayed page is correct" do
+        it "the displayed page is correct (for Sidekiq=v#{Sidekiq::VERSION.split('.').first})" do
           subject
 
           expect(last_response.status).to eq 200
@@ -98,6 +98,16 @@ module Sidekiq
             subject { get "/undertaker/morgue/HardWorker/RuntimeError/1_hour" }
 
             it_behaves_like "a page"
+
+            context "with pagination" do
+              before do
+                50.times do |i|
+                  job_refs.push add_dead("jid" => i.to_s)
+                end
+              end
+
+              it_behaves_like "a page"
+            end
           end
 
           context "with all failures and errors" do

data/web/views/morgue.erb

@@ -8,11 +8,9 @@
     </h3>
   </div>
   <div class="col-sm-12">
-    <% if @total_dead > 0 && @total_dead > @count %>
-      <div class="col-sm-4">
-        <%= erb :_paging, :locals => { :url => "#{root_path}" + @undertaker_path } %>
-      </div>
-    <% end %>
+    <div class="col-sm-4">
+      <%= erb :_paging, :locals => { :url => "#{root_path}" + @undertaker_path } %>
+    </div>
   </div>
 </header>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-undertaker
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc03
+  version: 1.0.2
 platform: ruby
 authors:
 - Thomas Koppensteiner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,22 +36,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: approvals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.24
   type: :development
@@ -59,9 +56,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.24
 - !ruby/object:Gem::Dependency
@@ -182,42 +176,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop_runner
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +286,7 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
     - - "<"
@@ -288,7 +296,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
     - - "<"
@@ -307,6 +315,7 @@ files:
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_codeclimate.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - Demo_Filter.png
@@ -326,11 +335,12 @@ files:
 - lib/sidekiq/undertaker/web_extension.rb
 - lib/sidekiq/undertaker/web_extension/api_helpers.rb
 - sidekiq-undertaker.gemspec
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/with_pagination/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
 - spec/sidekiq/undertaker/bucket_spec.rb
 - spec/sidekiq/undertaker/dead_jobs_spec.rb
 - spec/sidekiq/undertaker/job_distributor_spec.rb
@@ -358,23 +368,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Sidekiq::Undertaker allows exploring, reviving or burying dead jobs
 test_files:
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
-- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_called/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_job_classbucket_page_is_polled/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_all_failures_and_errors/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
+- spec/fixtures/approvals/sidekiq_undertaker_webextension/show_morgue/when_job_classerrorbucket_is_called/with_specific_job_class_and_a_specific_error/with_pagination/behaves_like_a_page/the_displayed_page_is_correct_for_sidekiqv6.approved.txt
 - spec/sidekiq/undertaker/bucket_spec.rb
 - spec/sidekiq/undertaker/dead_jobs_spec.rb
 - spec/sidekiq/undertaker/job_distributor_spec.rb