diff --git a/Gemfile b/Gemfile index fbd6547b..2149b7af 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 dd19ad0d..85452081 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) @@ -557,7 +557,7 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) rails_12factor (0.0.3) rails_serve_static_assets @@ -647,27 +647,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.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.4) 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.12.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.12.0) rubyzip (2.3.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -712,10 +712,10 @@ GEM net-http-persistent (~> 4.0, >= 4.0.1) rdf (~> 3.2, >= 3.2.6) 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) @@ -822,7 +822,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.6)