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

bump jasmine

Browse source
This commit is contained in:
Jonne Haß 2015-12-10 18:54:23 +01:00 committed by Dennis Schubert
parent 1223d6887c
commit d62f3c8668
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -281,7 +281,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.3.1" gem "jasmine", "2.4.0"
gem "jasmine-jquery-rails", "2.0.3" gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
gem "sinon-rails", "1.15.0" gem "sinon-rails", "1.15.0"

7
Gemfile.lock
View file

@ -114,7 +114,6 @@ GEM
compass (~> 1.0.0) compass (~> 1.0.0)
sass-rails (< 5.1) sass-rails (< 5.1)
sprockets (< 2.13) sprockets (< 2.13)
concurrent-ruby (1.0.0)
configurate (0.3.1) configurate (0.3.1)
connection_pool (2.2.0) connection_pool (2.2.0)
crack (0.4.3) crack (0.4.3)
@ -392,8 +391,8 @@ 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.3.1) jasmine (2.4.0)
jasmine-core (~> 2.3) jasmine-core (~> 2.4)
phantomjs phantomjs
rack (>= 1.2.1) rack (>= 1.2.1)
rake rake
@ -815,7 +814,7 @@ DEPENDENCIES
handlebars_assets (= 0.22.0) handlebars_assets (= 0.22.0)
http_accept_language (= 2.0.5) http_accept_language (= 2.0.5)
i18n-inflector-rails (= 1.0.7) i18n-inflector-rails (= 1.0.7)
jasmine (= 2.3.1) jasmine (= 2.4.0)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.0.5) jquery-rails (= 4.0.5)
jquery-ui-rails (= 5.0.5) jquery-ui-rails (= 5.0.5)