From 8874296edd44abf4d7c131455779741062eeab09 Mon Sep 17 00:00:00 2001
From: Rohit Garg <rohitgarg19@gmail.com>
Date: Tue, 2 Apr 2013 11:25:27 +0530
Subject: [PATCH] Rohit Updated jasmine version

---
 Gemfile.lock | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2413a8e..75a035c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,12 +38,12 @@ GEM
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.3)
     arel (3.0.2)
     attr_required (0.0.5)
     builder (3.0.0)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.2.5)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -78,7 +78,7 @@ GEM
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.14.4)
       tzinfo
-    ffi (1.0.11)
+    ffi (1.6.0)
     fssm (0.2.9)
     guard (1.2.1)
       listen (>= 0.4.2)
@@ -101,19 +101,17 @@ GEM
     hike (1.2.1)
     httpclient (2.2.5)
     i18n (0.6.0)
-    jasmine (1.2.1)
-      jasmine-core (>= 1.2.0)
+    jasmine (1.3.2)
+      jasmine-core (~> 1.3.1)
       rack (~> 1.0)
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
-    jasmine-core (1.2.0)
+    jasmine-core (1.3.1)
     journey (1.0.3)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.3)
-    libwebsocket (0.1.5)
-      addressable
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
@@ -123,9 +121,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.3.5)
+    multi_json (1.7.2)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-oauth2 (0.14.4)
@@ -166,7 +164,7 @@ GEM
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
       rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
+    rspec-core (2.10.1)
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
@@ -181,11 +179,11 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)
@@ -202,6 +200,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
+    websocket (1.0.7)
 
 PLATFORMS
   ruby