diff --git a/Gemfile b/Gemfile index 92313980..c44dce44 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 1d4126d0..a71b09ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -488,7 +488,7 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.4) @@ -498,7 +498,7 @@ GEM mime-types (2.99.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.3) + minitest (5.14.4) mongoid (5.1.6) activemodel (~> 4.0) mongo (~> 2.1) @@ -561,7 +561,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.11.3) sprockets-rails - rails-deprecated_sanitizer (1.0.3) + rails-deprecated_sanitizer (1.0.4) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.9) activesupport (>= 4.2.0, < 5.0) @@ -654,27 +654,27 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.2.4) - 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.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) 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.10.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.10.2) rubyzip (2.3.0) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -719,10 +719,10 @@ GEM net-http-persistent (>= 2.9, < 4) rdf (~> 3.0) spring (2.1.1) - sprockets (3.7.2) + sprockets (4.0.2) 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) @@ -832,7 +832,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.1)