diff --git a/Changelog.md b/Changelog.md index 943bafb7e..328cf2c0f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -29,6 +29,7 @@ ## Gem Updates * Removed `debugger` since it was causing bundle problems, and is not necessary given 1.9.3 has a built-in debugger. +* jasmine 1.2.1 -> 1.3.1 (+ remove useless spec) # 0.0.2.0 diff --git a/Gemfile b/Gemfile index 05b4e6a50..121f572e8 100644 --- a/Gemfile +++ b/Gemfile @@ -132,7 +132,7 @@ gem 'faraday', '0.8.4' gem 'faraday_middleware', '0.9.0' -gem 'jasmine', '1.2.1' +gem 'jasmine', '1.3.1' ### GROUPS #### diff --git a/Gemfile.lock b/Gemfile.lock index 8bed06f5d..f043524e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,12 +184,12 @@ GEM actionpack (~> 3.0) i18n-inflector (~> 2.6) railties (~> 3.0) - jasmine (1.2.1) - jasmine-core (>= 1.2.0) + jasmine (1.3.1) + jasmine-core (~> 1.3.1) rack (~> 1.0) rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) - jasmine-core (1.2.0) + jasmine-core (1.3.1) journey (1.0.4) jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) @@ -445,7 +445,7 @@ DEPENDENCIES handlebars_assets (= 0.6.6) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) - jasmine (= 1.2.1) + jasmine (= 1.3.1) jquery-rails (= 2.1.3) json (= 1.7.5) markerb! diff --git a/spec/javascripts/app/app_spec.js b/spec/javascripts/app/app_spec.js index 5e5958640..e5f396fd1 100644 --- a/spec/javascripts/app/app_spec.js +++ b/spec/javascripts/app/app_spec.js @@ -1,9 +1,5 @@ describe("app", function() { describe("user", function() { - it("sets the user if given one and returns the current user", function() { - expect(app.user()).toBeFalsy() - }); - it("returns false if the current_user isn't set", function() { app._user = undefined; expect(app.user()).toEqual(false);