Upgrade Ember to 1.1.2

2013-10-29 13:01:42 -04:00
parent c9c7dc2002
commit 5689e314c5
20 changed files with 1565 additions and 1828 deletions
@@ -17,7 +17,7 @@ asyncTestDiscourse('find', function() {
 });

 asyncTestDiscourse('generateMasterKey', function() {
-  this.stub(Discourse, 'ajax').returns(Ember.RSVP.resolve([]));
+  this.stub(Discourse, 'ajax').returns(Ember.RSVP.resolve({api_key: {}}));
  Discourse.ApiKey.generateMasterKey().then(function() {
    start();
    ok(Discourse.ajax.calledWith("/admin/api/key", {type: 'POST'}), "it POSTs to create a master key");