diff --git a/Gemfile b/Gemfile index 8697a61b1f377ed106c5b9597bdf9130b9ba4527..a6fff693964f3ac87cebe8e25f17be28f93c50e2 100644 --- a/Gemfile +++ b/Gemfile @@ -262,7 +262,7 @@ group :development, :test do gem 'cucumber-rails', '1.4.2', :require => false # Jasmine (client side application tests (JS)) - gem 'jasmine', '2.1.0' + gem 'jasmine', '2.2.0' gem 'jasmine-jquery-rails', '2.0.3' gem 'sinon-rails', '1.10.3' end diff --git a/Gemfile.lock b/Gemfile.lock index 71b14c7ffe6f81b9cb08a1667680bb70c1d7ecb8..088a6771467b8c5dde67c9cd61477a1ebab54a83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -291,12 +291,12 @@ GEM ice_cube (0.11.1) inflecto (0.0.2) ipaddress (0.8.0) - jasmine (2.1.0) - jasmine-core (~> 2.1.0) + jasmine (2.2.0) + jasmine-core (~> 2.2) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.1.2) + jasmine-core (2.2.0) jasmine-jquery-rails (2.0.3) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) @@ -385,7 +385,7 @@ GEM nokogiri rbvmomi orm_adapter (0.5.0) - phantomjs (1.9.7.1) + phantomjs (1.9.8.0) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -481,7 +481,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.3.2) + rake (10.4.2) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -662,7 +662,7 @@ DEPENDENCIES handlebars_assets (= 0.18.0) http_accept_language (= 2.0.2) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.1.0) + jasmine (= 2.2.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 3.1.2) js-routes (= 0.9.9)