Merge pull request #5679 from svbergerem/update-jasmine-ajax

Update jasmine-ajax

Gemfile

@@ -262,7 +262,8 @@ group :development, :test do
   gem 'cucumber-rails',     '1.4.2', :require => false
 
   # Jasmine (client side application tests (JS))
-  gem 'jasmine',              '2.2.0'
-  gem 'jasmine-jquery-rails', '2.0.3'
-  gem 'sinon-rails',          '1.10.3'
+  gem 'jasmine',                   '2.2.0'
+  gem 'jasmine-jquery-rails',      '2.0.3'
+  gem 'rails-assets-jasmine-ajax', '3.0.0'
+  gem 'sinon-rails',               '1.10.3'
 end

Gemfile.lock

@@ -429,6 +429,9 @@ GEM
       rails-assets-jquery-fullscreen (~> 1.1.4)
       rails-assets-jquery-ui (~> 1.10.4)
       rails-assets-jquery.slimscroll (~> 1.3.3)
+    rails-assets-jasmine (2.2.1)
+    rails-assets-jasmine-ajax (3.0.0)
+      rails-assets-jasmine (~> 2.0)
     rails-assets-jeresig--jquery.hotkeys (0.2.0)
       rails-assets-jquery (>= 1.4.2)
     rails-assets-jquery (1.11.1)
@@ -693,6 +696,7 @@ DEPENDENCIES
   rack-ssl (= 1.4.1)
   rails (= 4.1.8)
   rails-assets-diaspora_jsxc (~> 0.0.9)
+  rails-assets-jasmine-ajax (= 3.0.0)
   rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
   rails-assets-jquery (= 1.11.1)
   rails-assets-jquery-idletimer (= 1.0.1)

app/assets/javascripts/jasmine-load-all.js

@@ -8,3 +8,4 @@
 //= require profile
 //= require contact-list
 //= require sinon
+//= require jasmine-ajax

spec/controllers/jasmine_fixtures/photos_spec.rb

@@ -0,0 +1,20 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+require 'spec_helper'
+
+describe PhotosController, :type => :controller do
+  before do
+    @alices_photo = alice.post(:photo, :user_file => uploaded_photo, :to => alice.aspects.first.id, :public => false)
+    sign_in :user, alice
+  end
+
+  describe '#index' do
+    it "generates a jasmine fixture", :fixture => true do
+      request.env['HTTP_ACCEPT'] = 'application/json'
+      get :index, :person_id => alice.person.guid.to_s
+      save_fixture(response.body, "photos_json")
+    end
+  end
+end

spec/controllers/photos_controller_spec.rb

@@ -99,7 +99,6 @@
       get :index, :person_id => alice.person.guid.to_s
 
       expect(response.headers['Content-Type']).to match 'application/json.*'
-      save_fixture(response.body, "photos_json")
     end
 
     it 'displays by date of creation' do

spec/javascripts/app/views/aspect_membership_blueprint_view_spec.js

@@ -26,15 +26,15 @@ describe("app.views.AspectMembershipBlueprint", function(){
 
     it('marks the aspect as selected', function() {
       this.newAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect(this.newAspect.attr('class')).toContain('selected');
     });
 
     it('displays flash message when added to first aspect', function() {
       spec.content().find('li').removeClass('selected');
       this.newAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect($('[id^="flash"]')).toBeSuccessFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.started_sharing_with', {name: this.person_name})
@@ -43,7 +43,7 @@ describe("app.views.AspectMembershipBlueprint", function(){
 
     it('displays an error when it fails', function() {
       this.newAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_fail);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_fail);
 
       expect($('[id^="flash"]')).toBeErrorFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.error', {name: this.person_name})
@@ -59,15 +59,15 @@ describe("app.views.AspectMembershipBlueprint", function(){
 
     it('marks the aspect as unselected', function(){
       this.oldAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect(this.oldAspect.attr('class')).not.toContain('selected');
     });
 
     it('displays a flash message when removed from last aspect', function() {
       spec.content().find('li.selected:last').removeClass('selected');
       this.oldAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect($('[id^="flash"]')).toBeSuccessFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.stopped_sharing_with', {name: this.person_name})
@@ -76,7 +76,7 @@ describe("app.views.AspectMembershipBlueprint", function(){
 
     it('displays an error when it fails', function() {
       this.oldAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_fail);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_fail);
 
       expect($('[id^="flash"]')).toBeErrorFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.error_remove', {name: this.person_name})

spec/javascripts/app/views/aspect_membership_view_spec.js

@@ -26,15 +26,15 @@ describe("app.views.AspectMembership", function(){
 
     it('marks the aspect as selected', function() {
       this.newAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect(this.newAspect.attr('class')).toContain('selected');
     });
 
     it('displays flash message when added to first aspect', function() {
       spec.content().find('li').removeClass('selected');
       this.newAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect($('[id^="flash"]')).toBeSuccessFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.started_sharing_with', {name: this.person_name})
@@ -43,7 +43,7 @@ describe("app.views.AspectMembership", function(){
 
     it('displays an error when it fails', function() {
       this.newAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_fail);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_fail);
 
       expect($('[id^="flash"]')).toBeErrorFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.error', {name: this.person_name})
@@ -59,15 +59,15 @@ describe("app.views.AspectMembership", function(){
 
     it('marks the aspect as unselected', function(){
       this.oldAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect(this.oldAspect.attr('class')).not.toContain('selected');
     });
 
     it('displays a flash message when removed from last aspect', function() {
       spec.content().find('li.selected:last').removeClass('selected');
       this.oldAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_success);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_success);
 
       expect($('[id^="flash"]')).toBeSuccessFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.stopped_sharing_with', {name: this.person_name})
@@ -76,7 +76,7 @@ describe("app.views.AspectMembership", function(){
 
     it('displays an error when it fails', function() {
       this.oldAspect.trigger('click');
-      jasmine.Ajax.requests.mostRecent().response(resp_fail);
+      jasmine.Ajax.requests.mostRecent().respondWith(resp_fail);
 
       expect($('[id^="flash"]')).toBeErrorFlashMessage(
         Diaspora.I18n.t('aspect_dropdown.error_remove', {name: this.person_name})

spec/javascripts/app/views/bookmarklet_view_spec.js

@@ -54,7 +54,7 @@ describe('app.views.Bookmarklet', function() {
     init_bookmarklet(test_data);
     spec.content().find('form').submit();
 
-    jasmine.Ajax.requests.mostRecent().response({
+    jasmine.Ajax.requests.mostRecent().respondWith({
       status: 200,  // success!
       responseText: "{}"
     });

spec/javascripts/app/views/comment_stream_view_spec.js

@@ -44,21 +44,19 @@ describe("app.views.CommentStream", function(){
       });
 
       it("fires an AJAX request", function() {
-        var params = JSON.parse(this.request.params);
-        // TODO: use this, once jasmine-ajax is updated to latest version
-        //params = this.request.data();
+        var params = this.request.data();
 
         expect(params.text).toEqual("a new comment");
       });
 
       it("adds the comment to the view", function() {
-        this.request.response({status: 200, responseText: '[]'});
+        this.request.respondWith({status: 200, responseText: '[]'});
         expect(this.view.$(".comment-content p").text()).toEqual("a new comment");
       });
 
       it("doesn't add the comment to the view, when the request fails", function(){
         Diaspora.I18n.load({failed_to_post_message: "posting failed!"});
-        this.request.response({status: 500});
+        this.request.respondWith({status: 500});
 
         expect(this.view.$(".comment-content p").text()).not.toEqual("a new comment");
         expect($('*[id^="flash"]')).toBeErrorFlashMessage("posting failed!");
@@ -93,7 +91,7 @@ describe("app.views.CommentStream", function(){
       this.view.$("textarea").val("great post!");
       this.view.expandComments();
 
-      jasmine.Ajax.requests.mostRecent().response({ comments : [] });
+      jasmine.Ajax.requests.mostRecent().respondWith({ comments : [] });
 
       expect(this.view.$("textarea").val()).toEqual("great post!");
     });

spec/javascripts/app/views/contact_view_spec.js

@@ -50,7 +50,7 @@ describe("app.views.Contact", function(){
     it('adds a aspect_membership to the contact', function() {
       expect(this.model.aspect_memberships.length).toBe(1);
       $('.contact_add-to-aspect',this.contact).trigger('click');
-      jasmine.Ajax.requests.mostRecent().response({
+      jasmine.Ajax.requests.mostRecent().respondWith({
         status: 200, // success
         responseText: this.response
       });
@@ -60,7 +60,7 @@ describe("app.views.Contact", function(){
     it('calls render', function() {
       spyOn(this.view, 'render');
       $('.contact_add-to-aspect',this.contact).trigger('click');
-      jasmine.Ajax.requests.mostRecent().response({
+      jasmine.Ajax.requests.mostRecent().respondWith({
         status: 200, // success
         responseText: this.response
       });
@@ -70,7 +70,7 @@ describe("app.views.Contact", function(){
 
     it('displays a flash message on errors', function(){
       $('.contact_add-to-aspect',this.contact).trigger('click');
-      jasmine.Ajax.requests.mostRecent().response({
+      jasmine.Ajax.requests.mostRecent().respondWith({
         status: 400, // fail
       });
       expect($('[id^="flash"]')).toBeErrorFlashMessage(
@@ -102,7 +102,7 @@ describe("app.views.Contact", function(){
     it('removes the aspect_membership from the contact', function() {
       expect(this.model.aspect_memberships.length).toBe(1);
       $('.contact_remove-from-aspect',this.contact).trigger('click');
-      jasmine.Ajax.requests.mostRecent().response({
+      jasmine.Ajax.requests.mostRecent().respondWith({
         status: 200, // success
         responseText: this.response
       });
@@ -112,7 +112,7 @@ describe("app.views.Contact", function(){
     it('calls render', function() {
       spyOn(this.view, 'render');
       $('.contact_remove-from-aspect',this.contact).trigger('click');
-      jasmine.Ajax.requests.mostRecent().response({
+      jasmine.Ajax.requests.mostRecent().respondWith({
         status: 200, // success
         responseText: this.response,
       });
@@ -121,7 +121,7 @@ describe("app.views.Contact", function(){
 
     it('displays a flash message on errors', function(){
       $('.contact_remove-from-aspect',this.contact).trigger('click');
-      jasmine.Ajax.requests.mostRecent().response({
+      jasmine.Ajax.requests.mostRecent().respondWith({
         status: 400, // fail
       });
       expect($('[id^="flash"]')).toBeErrorFlashMessage(