Merge pull request #125 from resque/tests_fix

Tests fix

.gitignore

@@ -28,3 +28,7 @@ vendor/ruby
 Vagrantfile
 .vagrant
 .idea
+
+# wwtd
+gemfiles/.bundle
+vendor/

.travis.yml

@@ -1,16 +1,26 @@
 language: ruby
 sudo: false
 rvm:
+  - 2.0.0
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-9.0.5.0
-  - jruby-9.1.8.0
-  - rbx
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 services: redis
 before_script:
   - cd test/dummy && RAILS_ENV=test bundle exec rake db:migrate && cd -
+gemfile:
+  - gemfiles/rails40.gemfile
+  - gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
 matrix:
-  allow_failures:
-    - rvm: rbx
+  exclude:
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails41.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails50.gemfile

Appraisals

@@ -0,0 +1,23 @@
+if RUBY_VERSION < "2.4.0"
+  appraise 'rails40' do
+    gem 'rails', '~> 4.0.13'
+    gem 'nokogiri', '~> 1.6.0'
+  end
+
+  appraise 'rails41' do
+    gem 'rails', '~> 4.1.16'
+    gem 'nokogiri', '~> 1.6.0'
+  end
+end
+
+appraise 'rails42' do
+  gem 'rails', '~> 4.2.8'
+  gem 'nokogiri', '~> 1.6.0'
+end
+
+if RUBY_VERSION >= "2.2.0"
+  appraise 'rails50' do
+    gem 'rails', '~> 5.0.2'
+    gem 'rails-controller-testing'
+  end
+end

Gemfile

@@ -1,38 +1,12 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'rails', '~> 5.0.0'
-gem 'resque', github: 'resque'
 
-gem 'sqlite3', :platforms => :ruby
-gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5', :platforms => :jruby
-
-group :development, :test do
-  gem "dotenv-rails"
-  gem "rdoc"
-  gem 'listen', '~> 3.0.5'
-end
-
-group :test do
-  gem 'minitest-spec-rails'
-  gem 'coveralls', :require => false
-  gem 'redcard'
-  gem "mocha", :require => false
-  gem 'rails-controller-testing'
-end
-
-
-gem 'uglifier', '>= 1.0.3'
-
-gem 'libv8',        '~> 3.16.14.15', :platforms => :ruby
-gem 'therubyracer', '~> 0.12.2',    :platforms => :ruby
-gem 'therubyrhino', '2.0.4',        :platforms => :jruby
-
-platforms :rbx do
-  # These are the ruby standard library
-  # dependencies and transitive dependencies.
-  gem 'rubysl', '~> 2.0'
-  gem 'racc'
-  gem 'rubinius-profiler'
-  gem 'rubinius-coverage'
-end
+gem 'appraisal'
+gem 'uglifier'
+gem 'sqlite3'
+gem 'dotenv-rails'
+gem 'minitest-spec-rails'
+gem 'coveralls', require: false
+gem 'redcard'
+gem 'mocha', require: false