update jasmine gem, removed useless spec, + changelog)
This commit is contained in:
parent
e717eaac70
commit
94760f4c04
4 changed files with 6 additions and 9 deletions
|
|
@ -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
|
||||
|
|
|
|||
2
Gemfile
2
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 ####
|
||||
|
||||
|
|
|
|||
|
|
@ -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!
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue