diff --git a/Gemfile b/Gemfile index 82056007c..86df813c4 100644 --- a/Gemfile +++ b/Gemfile @@ -278,6 +278,6 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "2.2.0" 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.1", source: "https://rails-assets.org" gem "sinon-rails", "1.10.3" end diff --git a/Gemfile.lock b/Gemfile.lock index 14a6d982e..b34794e96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -498,9 +498,9 @@ GEM rails-assets-highlightjs (8.5.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) - rails-assets-jasmine (2.3.0) - rails-assets-jasmine-ajax (3.1.0) - rails-assets-jasmine (~> 2.0) + rails-assets-jasmine (2.3.1) + rails-assets-jasmine-ajax (3.1.1) + rails-assets-jasmine (~> 2) rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jquery (>= 1.4.2) rails-assets-jquery (1.11.2) @@ -781,7 +781,7 @@ DEPENDENCIES rails-assets-diaspora_jsxc (~> 0.1.1)! rails-assets-highlightjs (= 8.5.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! - rails-assets-jasmine-ajax (= 3.1.0)! + rails-assets-jasmine-ajax (= 3.1.1)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.11.2)! rails-assets-jquery-idletimer (= 1.0.1)! diff --git a/spec/javascripts/app/views/bookmarklet_view_spec.js b/spec/javascripts/app/views/bookmarklet_view_spec.js index 57296ad3b..bab7b5197 100644 --- a/spec/javascripts/app/views/bookmarklet_view_spec.js +++ b/spec/javascripts/app/views/bookmarklet_view_spec.js @@ -49,8 +49,6 @@ describe('app.views.Bookmarklet', function() { }); it('keeps the publisher disabled after successful post creation', function() { - jasmine.Ajax.install(); - init_bookmarklet(test_data); spec.content().find('form').submit(); diff --git a/spec/javascripts/app/views/poll_view_spec.js b/spec/javascripts/app/views/poll_view_spec.js index 31372dca5..0b9b7d5cc 100644 --- a/spec/javascripts/app/views/poll_view_spec.js +++ b/spec/javascripts/app/views/poll_view_spec.js @@ -23,7 +23,6 @@ describe("app.views.Poll", function(){ describe("vote", function(){ it("checks the ajax call for voting", function(){ - jasmine.Ajax.install(); var answer = this.view.poll.poll_answers[0]; var poll = this.view.poll;