REFACTOR: Remove Discourse.Ajax

test/javascripts/models/badge-test.js.es6

@@ -37,19 +37,15 @@ test('updateFromJson', function() {
 });
 
 test('save', function() {
-  sandbox.stub(Discourse, 'ajax').returns(Ember.RSVP.resolve({}));
+  expect(0);
   const badge = Badge.create({name: "New Badge", description: "This is a new badge.", badge_type_id: 1});
-  // TODO: clean API
-  badge.save(["name", "description", "badge_type_id"]);
-  ok(Discourse.ajax.calledOnce, "saved badge");
+  return badge.save(["name", "description", "badge_type_id"]);
 });
 
 test('destroy', function() {
-  sandbox.stub(Discourse, 'ajax');
+  expect(0);
   const badge = Badge.create({name: "New Badge", description: "This is a new badge.", badge_type_id: 1});
   badge.destroy();
-  ok(!Discourse.ajax.calledOnce, "no AJAX call for a new badge");
   badge.set('id', 3);
-  badge.destroy();
-  ok(Discourse.ajax.calledOnce, "AJAX call was made");
+  return badge.destroy();
 });

test/javascripts/models/topic-test.js.es6

@@ -55,24 +55,18 @@ test("destroy", function() {
   var user = Discourse.User.create({username: 'eviltrout'});
   var topic = Topic.create({id: 1234});
 
-  sandbox.stub(Discourse, 'ajax');
-
   topic.destroy(user);
   present(topic.get('deleted_at'), 'deleted at is set');
   equal(topic.get('deleted_by'), user, 'deleted by is set');
-  //ok(Discourse.ajax.calledOnce, "it called delete over the wire");
 });
 
 test("recover", function() {
   var user = Discourse.User.create({username: 'eviltrout'});
   var topic = Topic.create({id: 1234, deleted_at: new Date(), deleted_by: user});
 
-  sandbox.stub(Discourse, 'ajax');
-
   topic.recover();
   blank(topic.get('deleted_at'), "it clears deleted_at");
   blank(topic.get('deleted_by'), "it clears deleted_by");
-  //ok(Discourse.ajax.calledOnce, "it called recover over the wire");
 });
 
 test('fancyTitle', function() {

test/javascripts/models/user-badge-test.js.es6

@@ -1,12 +1,10 @@
 import UserBadge from 'discourse/models/user-badge';
+import badgeFixtures from 'fixtures/user-badges';
 
 module("model:user-badge");
 
-const singleBadgeJson = {"badges":[{"id":874,"name":"Badge 2","description":null,"badge_type_id":7}],"badge_types":[{"id":7,"name":"Silver 2"}],"users":[{"id":13470,"username":"anne3","avatar_template":"//www.gravatar.com/avatar/a4151b1fd72089c54e2374565a87da7f.png?s={size}\u0026r=pg\u0026d=identicon"}],"user_badge":{"id":665,"granted_at":"2014-03-09T20:30:01.190-04:00","badge_id":874,"granted_by_id":13470}},
-    multipleBadgesJson = {"badges":[{"id":880,"name":"Badge 8","description":null,"badge_type_id":13}],"badge_types":[{"id":13,"name":"Silver 8"}],"users":[],"user_badges":[{"id":668,"granted_at":"2014-03-09T20:30:01.420-04:00","badge_id":880,"granted_by_id":null}]};
-
 test('createFromJson single', function() {
-  const userBadge = UserBadge.createFromJson(singleBadgeJson);
+  const userBadge = UserBadge.createFromJson(badgeFixtures['/user_badges']);
   ok(!Array.isArray(userBadge), "does not return an array");
   equal(userBadge.get('badge.name'), "Badge 2", "badge reference is set");
   equal(userBadge.get('badge.badge_type.name'), "Silver 2", "badge.badge_type reference is set");
@@ -14,44 +12,31 @@ test('createFromJson single', function() {
 });
 
 test('createFromJson array', function() {
-  const userBadges = UserBadge.createFromJson(multipleBadgesJson);
+  const userBadges = UserBadge.createFromJson(badgeFixtures['/user-badges/:username']);
   ok(Array.isArray(userBadges), "returns an array");
   equal(userBadges[0].get('granted_by'), null, "granted_by reference is not set when null");
 });
 
-asyncTestDiscourse('findByUsername', function() {
-  expect(2);
-  sandbox.stub(Discourse, 'ajax').returns(Ember.RSVP.resolve(multipleBadgesJson));
-  UserBadge.findByUsername("anne3").then(function(badges) {
+test('findByUsername', function() {
+  return UserBadge.findByUsername("anne3").then(function(badges) {
     ok(Array.isArray(badges), "returns an array");
-    start();
   });
-  ok(Discourse.ajax.calledOnce, "makes an AJAX call");
 });
 
-asyncTestDiscourse('findByBadgeId', function() {
-  expect(2);
-  sandbox.stub(Discourse, 'ajax').returns(Ember.RSVP.resolve(multipleBadgesJson));
-  UserBadge.findByBadgeId(880).then(function(badges) {
+test('findByBadgeId', function() {
+  return UserBadge.findByBadgeId(880).then(function(badges) {
     ok(Array.isArray(badges), "returns an array");
-    start();
   });
-  ok(Discourse.ajax.calledOnce, "makes an AJAX call");
 });
 
-asyncTestDiscourse('grant', function() {
-  expect(2);
-  sandbox.stub(Discourse, 'ajax').returns(Ember.RSVP.resolve(singleBadgeJson));
-  UserBadge.grant(1, "username").then(function(userBadge) {
+test('grant', function() {
+  return UserBadge.grant(1, "username").then(function(userBadge) {
     ok(!Array.isArray(userBadge), "does not return an array");
-    start();
   });
-  ok(Discourse.ajax.calledOnce, "makes an AJAX call");
 });
 
 test('revoke', function() {
-  sandbox.stub(Discourse, 'ajax');
+  expect(0);
   const userBadge = UserBadge.create({id: 1});
-  userBadge.revoke();
-  ok(Discourse.ajax.calledOnce, "makes an AJAX call");
+  return userBadge.revoke();
 });