From f23a204e1f7d7fe0641b4df29e7067e0c9ffa0ca Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 24 Mar 2020 21:31:08 +0000 Subject: [PATCH 1/2] Update docs for rspec-rails 4 --- features/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/features/README.md b/features/README.md index e430a3c1bd..ddc3ec4e36 100644 --- a/features/README.md +++ b/features/README.md @@ -4,9 +4,8 @@ routing. ## Rails -rspec-rails 3 supports Rails 3.x and 4.x. For earlier versions of Rails, you -need [rspec-rails 1](https://github.com/dchelimsky/rspec-rails). For Rails 5.x, -make sure you are using rspec-rails 3.5.0 or newer. +rspec-rails 4 supports Rails 5.x and 6.x. For earlier versions of Rails, you +need [rspec-rails 3](https://github.com/rspec/rspec-rails/tree/3-9-maintenance). ## Install @@ -25,7 +24,7 @@ This installs the following gems: Add rspec-rails to the :test and :development groups in the Gemfile: group :test, :development do - gem 'rspec-rails', '~> 3.0.0' + gem 'rspec-rails', '~> 4.0.0' end It needs to be in the :development group to expose generators and rake tasks From 3e36b8f8120a0d05f49a456318033cab1db94af6 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 24 Mar 2020 21:58:51 +0000 Subject: [PATCH 2/2] Suspend jruby temporarily --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 35789781d1..3dfd4694f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,10 @@ script: "script/run_build 2>&1" dist: trusty matrix: + # temporary + allow_failures: + rvm: jruby-head + include: # Rails 6 builds - rvm: jruby-head