From b5c99709c3f6199bc439f4d66e77c77e2a414bd4 Mon Sep 17 00:00:00 2001
From: Sheel Choksi <sheelchoksi@gmail.com>
Date: Thu, 31 Oct 2013 09:54:47 -0700
Subject: [PATCH] Bump jasmine to 2.0.0rc5

---
 Gemfile                                     |  2 +-
 Gemfile.lock                                | 16 ++++++++--------
 lib/mock-ajax.js                            |  2 +-
 spec/javascripts/mock-ajax-toplevel-spec.js |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 45b6560..901053a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem 'rake'
-gem 'jasmine', "~> 2.0.0.rc3"
+gem 'jasmine', "~> 2.0.0.rc5"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9bffab4..20e6ff7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,15 +8,15 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     cliver (0.2.2)
-    jasmine (2.0.0.rc3)
-      jasmine-core (~> 2.0.0.rc3)
+    jasmine (2.0.0.rc5)
+      jasmine-core (~> 2.0.0.rc5)
       phantomjs
-      rack
+      rack (>= 1.2.1)
       rake
-    jasmine-core (2.0.0.rc3)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    multi_json (1.8.1)
+    jasmine-core (2.0.0.rc5)
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     phantomjs (1.8.1.1)
@@ -38,5 +38,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jasmine (~> 2.0.0.rc3)
+  jasmine (~> 2.0.0.rc5)
   rake
diff --git a/lib/mock-ajax.js b/lib/mock-ajax.js
index 845d404..f81abf0 100644
--- a/lib/mock-ajax.js
+++ b/lib/mock-ajax.js
@@ -181,7 +181,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
       responseTimeout: function() {
         this.readyState = 4;
-        clock.tick(30000);
+        jasmine.clock().tick(30000);
         this.onreadystatechange('timeout');
       }
     });
diff --git a/spec/javascripts/mock-ajax-toplevel-spec.js b/spec/javascripts/mock-ajax-toplevel-spec.js
index 3a87d58..37b0865 100644
--- a/spec/javascripts/mock-ajax-toplevel-spec.js
+++ b/spec/javascripts/mock-ajax-toplevel-spec.js
@@ -299,7 +299,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() {
 
   describe('when simulating a response with request.responseTimeout', function() {
     beforeEach(function() {
-      clock.install();
+      jasmine.clock().install();
 
       client = new fakeGlobal.XMLHttpRequest();
       client.onreadystatechange = onreadystatechange;
@@ -318,7 +318,7 @@ describe("Jasmine Mock Ajax (for toplevel)", function() {
     });
 
     afterEach(function() {
-      clock.uninstall();
+      jasmine.clock().uninstall();
     });
 
     it("should not call the success handler", function() {