Skip to content

Commit

Permalink
Update test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
rwojsznis committed Dec 14, 2015
1 parent a9ffbcd commit 3f0d69a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
source 'https://rubygems.org'
gemspec

gem "minitest"

platforms :rbx do
gem "rubysl", "~> 2.0" # if using anything in the ruby standard library
gem "rubinius-developer_tools", "~> 2.0.0" # if using any of coverage, debugger, profiler
gem "minitest" # if using minitest
end
7 changes: 1 addition & 6 deletions lib/sidekiq/expected_failures.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "sidekiq/expected_failures/version"
require "sidekiq/expected_failures/middleware"
require "sidekiq/expected_failures/web"


module Sidekiq

Expand Down Expand Up @@ -54,11 +54,6 @@ def self.clear(dates)
end
end

if defined?(Sidekiq::Web)
Sidekiq::Web.register Sidekiq::ExpectedFailures::Web
Sidekiq::Web.tabs["Expected Failures"] = "expected_failures"
end

Sidekiq.configure_server do |config|
config.server_middleware do |chain|
chain.add Sidekiq::ExpectedFailures::Middleware
Expand Down
3 changes: 3 additions & 0 deletions lib/sidekiq/expected_failures/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ def link_to_details(job)
end
end
end

Sidekiq::Web.register Sidekiq::ExpectedFailures::Web
Sidekiq::Web.tabs["Expected Failures"] = "expected_failures"
1 change: 1 addition & 0 deletions sidekiq-expected_failures.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "timecop", "~> 0.7.0"
spec.add_development_dependency "mocha", "~> 1.0.0"
spec.add_development_dependency "coveralls", "~> 0.7.0"
spec.add_development_dependency "minitest", "~> 5.7", ">= 5.7.0"
end
1 change: 0 additions & 1 deletion test/lib/web_test.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require "test_helper"
require "sidekiq/web"

module Sidekiq
describe "WebExtension" do
Expand Down
15 changes: 9 additions & 6 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,26 @@
Encoding.default_external = Encoding::UTF_8
Encoding.default_internal = Encoding::UTF_8

ENV['RACK_ENV'] = 'test'

require "minitest/autorun"
require "minitest/spec"
require "minitest/mock"
require "minitest/pride"
require "mocha/setup"


require "mocha/api"
require "timecop"
require "rack/test"

require "sidekiq"
require "sidekiq/web"

require "sidekiq-expected_failures"
require "test_workers"
require "sidekiq/expected_failures/web"

require_relative "test_workers"

Sidekiq.logger.level = Logger::ERROR

REDIS = Sidekiq::RedisConnection.create(url: "redis://localhost/15", namespace: "sidekiq_expected_failures")
REDIS = Sidekiq::RedisConnection.create(url: "redis://localhost/15")

def redis(command, *args)
Sidekiq.redis do |c|
Expand Down

0 comments on commit 3f0d69a

Please sign in to comment.