From 3040e9f1d14e9b4970a28495942d8923018568fa Mon Sep 17 00:00:00 2001 From: JR Boyens Date: Wed, 19 Dec 2012 21:56:14 -0800 Subject: [PATCH] Upgrade to jasmine-core 1.3.1, jasmine-gem locked to 1.2 series --- Gemfile | 3 ++- Gemfile.lock | 53 +++++++++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index c948dd3..12f4977 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source :rubygems -gem 'jasmine', "~> 1.1.0" +gem 'rake' +gem 'jasmine', "~> 1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index faebeef..a77aa7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,42 @@ GEM remote: http://rubygems.org/ specs: - childprocess (0.2.2) - ffi (~> 1.0.6) + addressable (2.3.2) + childprocess (0.3.6) + ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - jasmine (1.1.0) - jasmine-core (>= 1.1.0) - rack (>= 1.1) + ffi (1.2.0) + jasmine (1.2.1) + jasmine-core (>= 1.2.0) + rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - jasmine-core (1.1.0) - json_pure (1.6.1) - rack (1.3.3) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.6.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + jasmine-core (1.3.1) + libwebsocket (0.1.7.1) + addressable + websocket + multi_json (1.5.0) + rack (1.4.1) + rake (0.9.2.2) + rspec (2.12.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) + diff-lcs (~> 1.1.3) + rspec-mocks (2.12.0) + rubyzip (0.9.9) + selenium-webdriver (2.27.2) + childprocess (>= 0.2.5) + libwebsocket (~> 0.1.3) + multi_json (~> 1.0) rubyzip + websocket (1.0.5) PLATFORMS ruby DEPENDENCIES - jasmine (~> 1.1.0) + jasmine (~> 1.2.1) + rake