Commit ef7cfdceea0355c0e9c434ec3fc2b9915979da5e
1 parent
20972691
Exists in
spb-stable
and in
2 other branches
Update jasmine.
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
Gemfile
| @@ -224,7 +224,7 @@ group :development, :test do | @@ -224,7 +224,7 @@ group :development, :test do | ||
| 224 | # PhantomJS driver for Capybara | 224 | # PhantomJS driver for Capybara |
| 225 | gem 'poltergeist', '~> 1.5.1' | 225 | gem 'poltergeist', '~> 1.5.1' |
| 226 | 226 | ||
| 227 | - gem 'jasmine', '2.0.0.rc5' | 227 | + gem 'jasmine', '2.0.2' |
| 228 | 228 | ||
| 229 | gem "spring", '1.1.1' | 229 | gem "spring", '1.1.1' |
| 230 | gem "spring-commands-rspec", '1.0.1' | 230 | gem "spring-commands-rspec", '1.0.1' |
Gemfile.lock
| @@ -244,12 +244,12 @@ GEM | @@ -244,12 +244,12 @@ GEM | ||
| 244 | httpauth (0.2.0) | 244 | httpauth (0.2.0) |
| 245 | i18n (0.6.9) | 245 | i18n (0.6.9) |
| 246 | ice_nine (0.10.0) | 246 | ice_nine (0.10.0) |
| 247 | - jasmine (2.0.0.rc5) | ||
| 248 | - jasmine-core (~> 2.0.0.rc5) | 247 | + jasmine (2.0.2) |
| 248 | + jasmine-core (~> 2.0.0) | ||
| 249 | phantomjs | 249 | phantomjs |
| 250 | rack (>= 1.2.1) | 250 | rack (>= 1.2.1) |
| 251 | rake | 251 | rake |
| 252 | - jasmine-core (2.0.0.rc5) | 252 | + jasmine-core (2.0.0) |
| 253 | jquery-atwho-rails (0.3.3) | 253 | jquery-atwho-rails (0.3.3) |
| 254 | jquery-rails (3.1.0) | 254 | jquery-rails (3.1.0) |
| 255 | railties (>= 3.0, < 5.0) | 255 | railties (>= 3.0, < 5.0) |
| @@ -617,7 +617,7 @@ DEPENDENCIES | @@ -617,7 +617,7 @@ DEPENDENCIES | ||
| 617 | haml-rails | 617 | haml-rails |
| 618 | hipchat (~> 0.14.0) | 618 | hipchat (~> 0.14.0) |
| 619 | httparty | 619 | httparty |
| 620 | - jasmine (= 2.0.0.rc5) | 620 | + jasmine (= 2.0.2) |
| 621 | jquery-atwho-rails (~> 0.3.3) | 621 | jquery-atwho-rails (~> 0.3.3) |
| 622 | jquery-rails | 622 | jquery-rails |
| 623 | jquery-scrollto-rails | 623 | jquery-scrollto-rails |