From 25020c24935a102ffbe6ea4f2a2d718990eb91c1 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Tue, 18 Oct 2016 01:41:32 +0200
Subject: [PATCH] Bump jasmine

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3ddc7c68e..60ffd81ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -300,7 +300,7 @@ group :development, :test do
   gem "cucumber-rails", "1.4.5", require: false
 
   # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "2.4.0"
+  gem "jasmine",                   "2.5.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 7efcc0e02..197205716 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -444,12 +444,12 @@ GEM
       railties (>= 3.0.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
-    jasmine (2.4.0)
-      jasmine-core (~> 2.4)
+    jasmine (2.5.1)
+      jasmine-core (>= 2.5.1, < 3.0.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.4.1)
+    jasmine-core (2.5.2)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
@@ -959,7 +959,7 @@ DEPENDENCIES
   handlebars_assets (= 0.23.1)
   http_accept_language (= 2.0.5)
   i18n-inflector-rails (= 1.0.7)
-  jasmine (= 2.4.0)
+  jasmine (= 2.5.1)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.1.1)
   jquery-ui-rails (= 5.0.5)