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

Merge pull request #5909 from svbergerem/update-jasmine

Browse source 
Update jasmine
This commit is contained in:
Jonne Haß 2015-05-04 03:53:54 +02:00
commit 381e4978d9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -275,7 +275,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.2.0" gem "jasmine", "2.3.0"
gem "jasmine-jquery-rails", "2.0.3" gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org" gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org"
gem "sinon-rails", "1.10.3" gem "sinon-rails", "1.10.3"

8
Gemfile.lock
View file

@ -345,12 +345,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.2.0) jasmine (2.3.0)
jasmine-core (~> 2.2) jasmine-core (~> 2.3)
phantomjs phantomjs
rack (>= 1.2.1) rack (>= 1.2.1)
rake rake
jasmine-core (2.2.0) jasmine-core (2.3.0)
jasmine-jquery-rails (2.0.3) jasmine-jquery-rails (2.0.3)
jquery-rails (4.0.3) jquery-rails (4.0.3)
rails-dom-testing (~> 1.0) rails-dom-testing (~> 1.0)
@ -742,7 +742,7 @@ DEPENDENCIES
handlebars_assets (= 0.20.1) handlebars_assets (= 0.20.1)
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.2.0) jasmine (= 2.3.0)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.0.3) jquery-rails (= 4.0.3)
jquery-ui-rails (= 5.0.3) jquery-ui-rails (= 5.0.3)