diff --git a/Gemfile b/Gemfile index 0329ec07..34ffb8b7 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'highline' gem 'jbuilder' gem 'jquery-rails' gem 'jquery-turbolinks' -gem 'ims-lti', '1.1.10' # version 1.1.13 will crash, because @provider.valid_request?(request) on lti.rb line 89 will return false. +gem 'ims-lti', '< 2.0.0' gem 'kramdown' gem 'newrelic_rpm' gem 'pg', '< 1.0', platform: :ruby @@ -22,7 +22,7 @@ gem 'rails', '4.2.10' gem 'rails-i18n' gem 'ransack' gem 'rubytree' -gem 'sass-rails', '>= 5.0.7' +gem 'sass-rails' gem 'slim-rails' gem 'bootstrap_pagedown' gem 'sorcery' @@ -35,7 +35,7 @@ gem 'nokogiri' gem 'd3-rails', '~>4.0' gem 'rest-client' gem 'rubyzip' -gem 'mnemosyne-ruby', '~> 1.0' +gem 'mnemosyne-ruby' gem 'whenever', require: false group :development, :staging do @@ -59,7 +59,7 @@ end group :test do gem 'autotest-rails' gem 'capybara' - gem 'capybara-selenium', '>= 0.0.6' + gem 'selenium-webdriver' gem 'headless' gem 'codeclimate-test-reporter', require: false gem 'database_cleaner' diff --git a/Gemfile.lock b/Gemfile.lock index b5219e5d..26f12f09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,9 +87,6 @@ GEM rack (>= 1.6.0) rack-test (>= 0.6.3) xpath (~> 3.1) - capybara-selenium (0.0.6) - capybara - selenium-webdriver carrierwave (1.2.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) @@ -145,9 +142,9 @@ GEM domain_name (~> 0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - ims-lti (1.1.10) + ims-lti (1.2.2) builder - oauth (~> 0.4.5) + oauth (>= 0.4.5, < 0.6) jaro_winkler (1.5.1) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -189,7 +186,7 @@ GEM mini_portile2 (~> 2.3.0) nyan-cat-formatter (0.12.0) rspec (>= 2.99, >= 2.14.2, < 4) - oauth (0.4.7) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -385,7 +382,6 @@ DEPENDENCIES capistrano-upload-config capistrano3-puma capybara - capybara-selenium (>= 0.0.6) carrierwave codeclimate-test-reporter concurrent-ruby @@ -398,12 +394,12 @@ DEPENDENCIES forgery headless highline - ims-lti (= 1.1.10) + ims-lti (< 2.0.0) jbuilder jquery-rails jquery-turbolinks kramdown - mnemosyne-ruby (~> 1.0) + mnemosyne-ruby newrelic_rpm nokogiri nyan-cat-formatter @@ -422,7 +418,8 @@ DEPENDENCIES rubocop-rspec rubytree rubyzip - sass-rails (>= 5.0.7) + sass-rails + selenium-webdriver simplecov slim-rails sorcery