sidekiq-undertaker 1.0.0.rc03 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +9 -2
  3. data/.gitignore +1 -0
  4. data/.rubocop.yml +4 -0
  5. data/.rubocop_codeclimate.yml +5 -0
  6. data/.rubocop_todo.yml +5 -5
  7. data/.travis.yml +22 -17
  8. data/README.md +3 -2
  9. data/Rakefile +2 -0
  10. data/lib/sidekiq/undertaker/dead_job.rb +1 -1
  11. data/lib/sidekiq/undertaker/version.rb +1 -1
  12. data/lib/sidekiq/undertaker/web_extension/api_helpers.rb +5 -1
  13. data/lib/sidekiq/undertaker/web_extension.rb +2 -0
  14. data/lib/sidekiq/undertaker.rb +1 -1
  15. data/sidekiq-undertaker.gemspec +9 -6
  16. data/spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/{the_displayed_page_is_correct.approved.txt → the_displayed_page_is_correct_for_sidekiqv6.approved.txt} +1 -0
  17. data/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 → the_displayed_page_is_correct_for_sidekiqv6.approved.txt} +1 -0
  18. data/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 → the_displayed_page_is_correct_for_sidekiqv6.approved.txt} +1 -0
  19. data/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 → the_displayed_page_is_correct_for_sidekiqv6.approved.txt} +5 -1
  20. data/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 → the_displayed_page_is_correct_for_sidekiqv6.approved.txt} +5 -1
  21. data/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 +1304 -0
  22. data/spec/sidekiq/undertaker/dead_jobs_spec.rb +1 -1
  23. data/spec/sidekiq/undertaker/job_distributor_spec.rb +2 -2
  24. data/spec/sidekiq/undertaker/job_filter_spec.rb +1 -0
  25. data/spec/sidekiq/undertaker/web_extension_spec.rb +12 -2
  26. data/web/views/morgue.erb +3 -5
  27. metadata +43 -32
@@ -50,7 +50,7 @@ module Sidekiq
50
50
 
51
51
  describe ".for_each" do
52
52
  let(:expected_dead_job) do
53
- DeadJob.new(
53
+ described_class.new(
54
54
  job_class: "HardWorkTask",
55
55
  time_elapsed_since_failure: time_elapsed,
56
56
  error_class: "NoMethodError",
@@ -66,7 +66,7 @@ module Sidekiq
66
66
 
67
67
  let(:dead_jobs) { [dead_job1, dead_job2, dead_job3, dead_job4] }
68
68
 
69
- # rubocop:disable Metrics/LineLength
69
+ # rubocop:disable Layout/LineLength
70
70
  describe "#group_by_job_class" do
71
71
  subject(:distribution) { described_class.new(dead_jobs).group_by_job_class }
72
72
 
@@ -98,7 +98,7 @@ module Sidekiq
98
98
  expect(distribution).to eq expected_distribution
99
99
  end
100
100
  end
101
- # rubocop:enable Metrics/LineLength
101
+ # rubocop:enable Layout/LineLength
102
102
  end
103
103
  end
104
104
  end
@@ -81,6 +81,7 @@ module Sidekiq
81
81
  expect(dead_job.error_class).to eq "NoMethodError"
82
82
  end
83
83
  end
84
+
84
85
  it { expect(dead_jobs.size).to eq 2 }
85
86
  end
86
87
 
@@ -49,7 +49,7 @@ module Sidekiq
49
49
  after { Timecop.return }
50
50
 
51
51
  def add_dead(opts = {})
52
- opts = default_job_opts.merge!(opts)
52
+ opts = default_job_opts.merge(opts)
53
53
 
54
54
  job = build_job(opts)
55
55
  killed_job = kill_job(job)
@@ -58,7 +58,7 @@ module Sidekiq
58
58
  end
59
59
 
60
60
  shared_examples "a page" do
61
- it "the displayed page is correct" do
61
+ it "the displayed page is correct (for Sidekiq=v#{Sidekiq::VERSION.split('.').first})" do
62
62
  subject
63
63
 
64
64
  expect(last_response.status).to eq 200
@@ -98,6 +98,16 @@ module Sidekiq
98
98
  subject { get "/undertaker/morgue/HardWorker/RuntimeError/1_hour" }
99
99
 
100
100
  it_behaves_like "a page"
101
+
102
+ context "with pagination" do
103
+ before do
104
+ 50.times do |i|
105
+ job_refs.push add_dead("jid" => i.to_s)
106
+ end
107
+ end
108
+
109
+ it_behaves_like "a page"
110
+ end
101
111
  end
102
112
 
103
113
  context "with all failures and errors" do
data/web/views/morgue.erb CHANGED
@@ -8,11 +8,9 @@
8
8
  </h3>
9
9
  </div>
10
10
  <div class="col-sm-12">
11
- <% if @total_dead > 0 && @total_dead > @count %>
12
- <div class="col-sm-4">
13
- <%= erb :_paging, :locals => { :url => "#{root_path}" + @undertaker_path } %>
14
- </div>
15
- <% end %>
11
+ <div class="col-sm-4">
12
+ <%= erb :_paging, :locals => { :url => "#{root_path}" + @undertaker_path } %>
13
+ </div>
16
14
  </div>
17
15
  </header>
18
16
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sidekiq-undertaker
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc03
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas Koppensteiner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-12-11 00:00:00.000000000 Z
11
+ date: 2022-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -36,22 +36,19 @@ dependencies:
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: '12.3'
39
+ version: '13.0'
40
40
  type: :development
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - "~>"
45
45
  - !ruby/object:Gem::Version
46
- version: '12.3'
46
+ version: '13.0'
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: approvals
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
51
  - - "~>"
52
- - !ruby/object:Gem::Version
53
- version: '0.0'
54
- - - ">="
55
52
  - !ruby/object:Gem::Version
56
53
  version: 0.0.24
57
54
  type: :development
@@ -59,9 +56,6 @@ dependencies:
59
56
  version_requirements: !ruby/object:Gem::Requirement
60
57
  requirements:
61
58
  - - "~>"
62
- - !ruby/object:Gem::Version
63
- version: '0.0'
64
- - - ">="
65
59
  - !ruby/object:Gem::Version
66
60
  version: 0.0.24
67
61
  - !ruby/object:Gem::Dependency
@@ -182,42 +176,56 @@ dependencies:
182
176
  requirements:
183
177
  - - "~>"
184
178
  - !ruby/object:Gem::Version
185
- version: '1.2'
179
+ version: '2.3'
186
180
  type: :development
187
181
  prerelease: false
188
182
  version_requirements: !ruby/object:Gem::Requirement
189
183
  requirements:
190
184
  - - "~>"
191
185
  - !ruby/object:Gem::Version
192
- version: '1.2'
186
+ version: '2.3'
193
187
  - !ruby/object:Gem::Dependency
194
188
  name: rubocop
195
189
  requirement: !ruby/object:Gem::Requirement
196
190
  requirements:
197
191
  - - "~>"
198
192
  - !ruby/object:Gem::Version
199
- version: '0.77'
193
+ version: '1.8'
194
+ type: :development
195
+ prerelease: false
196
+ version_requirements: !ruby/object:Gem::Requirement
197
+ requirements:
198
+ - - "~>"
199
+ - !ruby/object:Gem::Version
200
+ version: '1.8'
201
+ - !ruby/object:Gem::Dependency
202
+ name: rubocop-rake
203
+ requirement: !ruby/object:Gem::Requirement
204
+ requirements:
205
+ - - "~>"
206
+ - !ruby/object:Gem::Version
207
+ version: '0.5'
200
208
  type: :development
201
209
  prerelease: false
202
210
  version_requirements: !ruby/object:Gem::Requirement
203
211
  requirements:
204
212
  - - "~>"
205
213
  - !ruby/object:Gem::Version
206
- version: '0.77'
214
+ version: '0.5'
207
215
  - !ruby/object:Gem::Dependency
208
216
  name: rubocop-rspec
209
217
  requirement: !ruby/object:Gem::Requirement
210
218
  requirements:
211
219
  - - "~>"
212
220
  - !ruby/object:Gem::Version
213
- version: '1.30'
221
+ version: '2.0'
214
222
  type: :development
215
223
  prerelease: false
216
224
  version_requirements: !ruby/object:Gem::Requirement
217
225
  requirements:
218
226
  - - "~>"
219
227
  - !ruby/object:Gem::Version
220
- version: '1.30'
228
+ version: '2.0'
221
229
  - !ruby/object:Gem::Dependency
222
230
  name: rubocop_runner
223
231
  requirement: !ruby/object:Gem::Requirement
@@ -278,7 +286,7 @@ dependencies:
278
286
  name: sidekiq
279
287
  requirement: !ruby/object:Gem::Requirement
280
288
  requirements:
281
- - - "~>"
289
+ - - ">="
282
290
  - !ruby/object:Gem::Version
283
291
  version: '5.2'
284
292
  - - "<"
@@ -288,7 +296,7 @@ dependencies:
288
296
  prerelease: false
289
297
  version_requirements: !ruby/object:Gem::Requirement
290
298
  requirements:
291
- - - "~>"
299
+ - - ">="
292
300
  - !ruby/object:Gem::Version
293
301
  version: '5.2'
294
302
  - - "<"
@@ -307,6 +315,7 @@ files:
307
315
  - ".codeclimate.yml"
308
316
  - ".gitignore"
309
317
  - ".rubocop.yml"
318
+ - ".rubocop_codeclimate.yml"
310
319
  - ".rubocop_todo.yml"
311
320
  - ".travis.yml"
312
321
  - Demo_Filter.png
@@ -326,11 +335,12 @@ files:
326
335
  - lib/sidekiq/undertaker/web_extension.rb
327
336
  - lib/sidekiq/undertaker/web_extension/api_helpers.rb
328
337
  - sidekiq-undertaker.gemspec
329
- - spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
330
- - 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
331
- - 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
332
- - 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
333
- - 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
338
+ - 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
339
+ - 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
340
+ - 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
341
+ - 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
342
+ - 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
343
+ - 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
334
344
  - spec/sidekiq/undertaker/bucket_spec.rb
335
345
  - spec/sidekiq/undertaker/dead_jobs_spec.rb
336
346
  - spec/sidekiq/undertaker/job_distributor_spec.rb
@@ -358,23 +368,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
358
368
  requirements:
359
369
  - - ">="
360
370
  - !ruby/object:Gem::Version
361
- version: '0'
371
+ version: 2.5.0
362
372
  required_rubygems_version: !ruby/object:Gem::Requirement
363
373
  requirements:
364
- - - ">"
374
+ - - ">="
365
375
  - !ruby/object:Gem::Version
366
- version: 1.3.1
376
+ version: '0'
367
377
  requirements: []
368
- rubygems_version: 3.0.2
378
+ rubygems_version: 3.0.3.1
369
379
  signing_key:
370
380
  specification_version: 4
371
381
  summary: Sidekiq::Undertaker allows exploring, reviving or burying dead jobs
372
382
  test_files:
373
- - spec/fixtures/approvals/sidekiq_undertaker_webextension/show_filter/when_filter_page_is_called/behaves_like_a_page/the_displayed_page_is_correct.approved.txt
374
- - 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
375
- - 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
376
- - 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
377
- - 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
383
+ - 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
384
+ - 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
385
+ - 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
386
+ - 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
387
+ - 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
388
+ - 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
378
389
  - spec/sidekiq/undertaker/bucket_spec.rb
379
390
  - spec/sidekiq/undertaker/dead_jobs_spec.rb
380
391
  - spec/sidekiq/undertaker/job_distributor_spec.rb