From 691274d068f70b66b43447899e99ceb1bb01d216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 19 Sep 2015 18:16:05 +0200 Subject: [PATCH] bump jasmine --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a421abf39..1d7d65693 100644 --- a/Gemfile +++ b/Gemfile @@ -279,7 +279,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.1" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index 79d0bd126..ae1d1b799 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -424,8 +424,8 @@ 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.1) + jasmine-core (~> 2.3) phantomjs rack (>= 1.2.1) rake @@ -841,7 +841,7 @@ DEPENDENCIES handlebars_assets (= 0.20.2) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.2.0) + jasmine (= 2.3.1) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.0.5) jquery-ui-rails (= 5.0.5)