diff --git a/Gemfile b/Gemfile index da1dc987..c860259a 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ group :production do end group :development, :test do - gem 'rspec-rails', "< 4" # version 4 requires rails 5 + gem 'rspec-rails', "< 5" # version 4 requires rails 5 gem 'cucumber-rails', '~> 1.4', require: false gem 'database_cleaner', '~> 1.99' gem 'coveralls', '~> 0.8', require: false diff --git a/Gemfile.lock b/Gemfile.lock index f443dc5c..169c1a23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,7 +181,7 @@ GEM json-schema rest-client debug_inspector (0.0.3) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docile (1.3.2) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) @@ -499,7 +499,7 @@ GEM mime-types (2.99.3) mini_mime (1.0.2) mini_portile2 (2.8.0) - minitest (5.15.0) + minitest (5.16.2) mongoid (5.1.6) activemodel (~> 4.0) mongo (~> 2.1) @@ -661,27 +661,27 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.5) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) + rspec-support (~> 3.11.0) + rspec-rails (4.1.2) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.11.0) rubyzip (2.3.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -726,10 +726,10 @@ GEM net-http-persistent (>= 2.9, < 4) rdf (~> 3.0) spring (2.1.1) - sprockets (3.7.2) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -840,7 +840,7 @@ DEPENDENCIES rake (~> 13.0) rest-client (~> 2.0) resumable_upload! - rspec-rails (< 4) + rspec-rails (< 5) rubyzip (~> 2.3) sass-rails (~> 6.0) sdoc (~> 2.4)