Merge pull request sidekiq-cron#273 from Pharmony/improvments/updates-dockerfile-and-solves-deprecation-warnings

Updates Docker files and fixes tests (Closes sidekiq-cron#271 sidekiq-cron#272)

Author: ondrejbartas

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.1
+FROM ruby:2.4
 MAINTAINER Joao Serra <joaopfserra@gmail.com>
 
 RUN apt-get update && \

docker-compose.yml

@@ -18,4 +18,6 @@ services:
     - redis:redis.test
     depends_on:
     - common
-    command: dockerize -wait tcp://redis.test:6379 -timeout 60s rake test
+    command: dockerize -wait tcp://redis.test:6379 -timeout 60s bundle exec rake test
+    volumes:
+    - .:/sidekiq-cron

lib/sidekiq/cron/web_extension.rb

@@ -25,7 +25,7 @@ def self.registered(app)
           view_path = File.join(File.expand_path("..", __FILE__), "views")
 
           @job = Sidekiq::Cron::Job.find(route_params[:name])
-          if @job.present?
+          if @job
             #if Slim renderer exists and sidekiq has layout.slim in views
             if defined?(Slim) && File.exists?(File.join(settings.views,"layout.slim"))
               render(:slim, File.read(File.join(view_path, "cron_show.slim")))

test/integration/performance_test.rb

@@ -6,9 +6,7 @@
   X = 10000
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis do |conn|
-      conn.flushdb
-    end
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|

test/test_helper.rb

@@ -20,7 +20,7 @@
 require "minitest/autorun"
 require 'shoulda-context'
 require "rack/test"
-require "mocha/setup"
+require 'mocha/minitest'
 
 ENV['RACK_ENV'] = 'test'
 

test/unit/poller_test.rb

@@ -5,9 +5,7 @@
 describe 'Cron Poller' do
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis do |conn|
-      conn.flushdb
-    end
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|

test/unit/web_extension_test.rb

@@ -9,7 +9,7 @@ def app
 
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis {|c| c.flushdb }
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|