github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 14:12:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Ember RC6 update

Browse Source
This commit is contained in:
Robin Ward
2013-07-15 19:47:13 -04:00
parent 75282576b9
commit d466d11e71
23 changed files with 5850 additions and 2002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/javascripts/models/composer_test.js
View File

@ -130,7 +130,7 @@ test('editingFirstPost', function() {
});
asyncTest('importQuote with a post', function() {
asyncTestDiscourse('importQuote with a post', function() {
expect(1);
this.stub(Discourse.Post, 'load').withArgs(123).returns(Em.Deferred.promise(function (p) {
@ -144,7 +144,7 @@ asyncTest('importQuote with a post', function() {
});
});
asyncTest('importQuote with no post', function() {
asyncTestDiscourse('importQuote with no post', function() {
expect(1);
this.stub(Discourse.Post, 'load').withArgs(4).returns(Em.Deferred.promise(function (p) {

6
test/javascripts/models/post_stream_test.js
View File

@ -213,7 +213,7 @@ test("identity map", function() {
deepEqual(postStream.listUnloadedIds([1, 2, 3, 4]), [2, 4], "it only returns unloaded posts");
});
asyncTest("loadIntoIdentityMap with no data", function() {
asyncTestDiscourse("loadIntoIdentityMap with no data", function() {
var postStream = buildStream(1234);
expect(1);
@ -224,11 +224,11 @@ asyncTest("loadIntoIdentityMap with no data", function() {
});
});
asyncTest("loadIntoIdentityMap with post ids", function() {
asyncTestDiscourse("loadIntoIdentityMap with post ids", function() {
var postStream = buildStream(1234);
expect(1);
this.stub(Discourse, "ajax").returns(resolvingPromiseWith({
this.stub(Discourse, "ajax").returns(Ember.RSVP.resolve({
post_stream: {
posts: [{id: 10, post_number: 10}]
}