From 19a19919bb0da825585509183388eb945cdecde9 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 2 May 2015 16:46:30 +0200 Subject: [PATCH] Update jasmine --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 5727347e9..cf9ff04da 100644 --- a/Gemfile +++ b/Gemfile @@ -274,7 +274,7 @@ group :development, :test do gem "cucumber-rails", "1.4.2", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "2.2.0" + gem "jasmine", "2.3.0" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org" gem "sinon-rails", "1.10.3" diff --git a/Gemfile.lock b/Gemfile.lock index 3a3e50dd6..8f761bd1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -345,12 +345,12 @@ GEM ice_cube (0.11.1) inflecto (0.0.2) ipaddress (0.8.0) - jasmine (2.2.0) - jasmine-core (~> 2.2) + jasmine (2.3.0) + jasmine-core (~> 2.3) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.2.0) + jasmine-core (2.3.0) jasmine-jquery-rails (2.0.3) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) @@ -488,7 +488,7 @@ GEM rails-assets-jquery-fullscreen (~> 1.1.4) rails-assets-jquery-ui (~> 1.10.4) rails-assets-jquery.slimscroll (~> 1.3.3) - rails-assets-jasmine (2.2.1) + rails-assets-jasmine (2.3.0) rails-assets-jasmine-ajax (3.1.0) rails-assets-jasmine (~> 2.0) rails-assets-jeresig--jquery.hotkeys (0.2.0) @@ -739,7 +739,7 @@ DEPENDENCIES handlebars_assets (= 0.20.1) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.2.0) + jasmine (= 2.3.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 3.1.2) jquery-ui-rails (= 5.0.3)