Skip to content

Commit

Permalink
Cleanup test helper
Browse files Browse the repository at this point in the history
  • Loading branch information
Tensho committed Dec 5, 2018
1 parent 76e862e commit 840a919
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 37 deletions.
3 changes: 2 additions & 1 deletion Rakefile
@@ -1,8 +1,9 @@
require 'bundler/gem_tasks'
require 'rake/testtask'

Rake::TestTask.new(:test) do |test|
test.warning = true
test.pattern = 'test/**/test_*.rb'
end

task :default => :test
task default: :test
3 changes: 2 additions & 1 deletion lib/sidekiq/rails.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true

module Sidekiq
class Rails < ::Rails::Engine
# We need to setup this up before any application configuration which might
Expand Down Expand Up @@ -54,4 +55,4 @@ def inspect
$stderr.puts("**************************************************")
$stderr.puts("⛔️ WARNING: Sidekiq server is no longer supported by Rails 3.2 - please ensure your server/workers are updated")
$stderr.puts("**************************************************")
end
end
28 changes: 0 additions & 28 deletions test/helper.rb
Expand Up @@ -20,36 +20,8 @@
end
end

ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'

trap 'TSTP' do
threads = Thread.list

puts
puts "=" * 80
puts "Received TSTP signal; printing all #{threads.count} thread backtraces."

threads.each do |thr|
description = thr == Thread.main ? "Main thread" : thr.inspect
puts
puts "#{description} backtrace: "
puts thr.backtrace.join("\n")
end

puts "=" * 80
end

require 'minitest/autorun'

Sidekiq.logger.level = Logger::ERROR

REDIS_URL = ENV['REDIS_URL'] || 'redis://localhost/15'
REDIS = Sidekiq::RedisConnection.create(:url => REDIS_URL)

Sidekiq.configure_client do |config|
config.redis = { :url => REDIS_URL }
end

def capture_logging(lvl=Logger::INFO)
old = Sidekiq.logger
begin
Expand Down
1 change: 0 additions & 1 deletion test/test_extensions.rb
Expand Up @@ -8,7 +8,6 @@
class TestExtensions < Minitest::Test
describe 'sidekiq extensions' do
before do
Sidekiq.redis = REDIS
Sidekiq.redis {|c| c.flushdb }
end

Expand Down
5 changes: 0 additions & 5 deletions test/test_fetch.rb
Expand Up @@ -6,17 +6,12 @@
class TestFetcher < Minitest::Test
describe 'fetcher' do
before do
Sidekiq.redis = { :url => REDIS_URL }
Sidekiq.redis do |conn|
conn.flushdb
conn.rpush('queue:basic', 'msg')
end
end

after do
Sidekiq.redis = REDIS
end

it 'retrieves' do
fetch = Sidekiq::BasicFetch.new(:queues => ['basic', 'bar'])
uow = fetch.retrieve_work
Expand Down
1 change: 0 additions & 1 deletion test/test_middleware.rb
Expand Up @@ -7,7 +7,6 @@ class TestMiddleware < Minitest::Test
describe 'middleware chain' do
before do
$errors = []
Sidekiq.redis = REDIS
end

class CustomMiddleware
Expand Down
1 change: 1 addition & 0 deletions test/test_redis_connection.rb
@@ -1,4 +1,5 @@
# frozen_string_literal: true

require_relative 'helper'
require 'sidekiq/cli'

Expand Down

0 comments on commit 840a919

Please sign in to comment.