nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update jasmine

Browse source
This commit is contained in:
Steffen van Bergerem 2015-02-10 19:28:52 +01:00
parent cb6502016c
commit 5f4f32f2cf
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -262,7 +262,7 @@ group :development, :test do
gem 'cucumber-rails', '1.4.2', :require => false gem 'cucumber-rails', '1.4.2', :require => false
# Jasmine (client side application tests (JS)) # Jasmine (client side application tests (JS))
gem 'jasmine', '2.1.0' gem 'jasmine', '2.2.0'
gem 'jasmine-jquery-rails', '2.0.3' gem 'jasmine-jquery-rails', '2.0.3'
gem 'sinon-rails', '1.10.3' gem 'sinon-rails', '1.10.3'
end end

12
Gemfile.lock
View file

@ -291,12 +291,12 @@ GEM
ice_cube (0.11.1) ice_cube (0.11.1)
inflecto (0.0.2) inflecto (0.0.2)
ipaddress (0.8.0) ipaddress (0.8.0)
jasmine (2.1.0) jasmine (2.2.0)
jasmine-core (~> 2.1.0) jasmine-core (~> 2.2)
phantomjs phantomjs
rack (>= 1.2.1) rack (>= 1.2.1)
rake rake
jasmine-core (2.1.2) jasmine-core (2.2.0)
jasmine-jquery-rails (2.0.3) jasmine-jquery-rails (2.0.3)
jquery-rails (3.1.2) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
@ -385,7 +385,7 @@ GEM
nokogiri nokogiri
rbvmomi rbvmomi
orm_adapter (0.5.0) orm_adapter (0.5.0)
phantomjs (1.9.7.1) phantomjs (1.9.8.0)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
@ -481,7 +481,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.13.0) raindrops (0.13.0)
rake (10.3.2) rake (10.4.2)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
@ -662,7 +662,7 @@ DEPENDENCIES
handlebars_assets (= 0.18.0) handlebars_assets (= 0.18.0)
http_accept_language (= 2.0.2) http_accept_language (= 2.0.2)
i18n-inflector-rails (= 1.0.7) i18n-inflector-rails (= 1.0.7)
jasmine (= 2.1.0) jasmine (= 2.2.0)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 3.1.2) jquery-rails (= 3.1.2)
js-routes (= 0.9.9) js-routes (= 0.9.9)