Skip to content

Commit ff98df7

Browse files
authored
Merge pull request #180 from ebaranowski/resque-upgrade
Upgrade Resque to allow 3.X Versions
2 parents f75421a + f3f83ba commit ff98df7

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- 6379:6379
1111
strategy:
1212
matrix:
13-
ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
13+
ruby-version: ['4.0', '3.4', '3.3', '3.2']
1414

1515
steps:
1616
- uses: actions/checkout@v2

resque-retry.gemspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ Gem::Specification.new do |s|
2828
s.files = `git ls-files`.split($/)
2929
s.require_paths = %w[lib]
3030

31-
s.add_dependency('resque', '>= 1.25', '< 3.0')
31+
s.add_dependency('resque', '>= 1.25', '< 4.0')
3232
s.add_dependency('resque-scheduler', '>= 4.0', '<6.0')
3333

3434
s.add_development_dependency('rake', '>= 10.3', '< 14')
35-
s.add_development_dependency('minitest', '~> 5.5')
36-
s.add_development_dependency('rack-test', '~> 0.6')
35+
s.add_development_dependency('minitest', '~> 6.0')
36+
s.add_development_dependency('rack-test', '~> 2.0')
3737
s.add_development_dependency('yard', '~> 0.8')
3838
s.add_development_dependency('json', '~> 2.0')
3939
s.add_development_dependency('simplecov', '~> 0.9')
40-
s.add_development_dependency('mocha', '~> 2.1')
40+
s.add_development_dependency('mocha', '~> 3.0')
4141
end

test/resque_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class ResqueTest < Minitest::Test
44
def test_resque_version
55
major, minor, _ = resque_version.split('.')
6-
assert [1, 2].include?(major.to_i), 'major version does not match'
6+
assert [1, 2, 3].include?(major.to_i), 'major version does not match'
77

88
if major.to_i == 1
99
assert_operator minor.to_i, :>=, 25, 'minor version is too low'

test/server_test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require 'test_helper'
2+
require 'rack/test'
23
require 'resque-retry/server'
34

45
ENV['RACK_ENV'] = ENV['RAILS_ENV']
@@ -17,6 +18,10 @@ def app
1718
Resque::Server
1819
end
1920

21+
def default_host
22+
'localhost'
23+
end
24+
2025
# make sure the world looks okay first =)
2126
def test_were_able_to_access_normal_resque_web_overview
2227
get '/overview'

test/test_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
require 'timeout'
1717
require 'minitest/autorun'
1818
require 'minitest/pride'
19-
require 'rack/test'
2019
require 'mocha/minitest'
2120

2221
require 'resque-retry'

0 commit comments

Comments
 (0)