Upgrade Ember to 1.1.2

app/assets/javascripts/admin/models/api_key.js

@@ -44,8 +44,8 @@ Discourse.ApiKey.reopenClass({
     @param {Object} the properties to create
     @returns {Discourse.ApiKey} the ApiKey instance
   **/
-  create: function(apiKey) {
-    var result = this._super(apiKey);
+  create: function() {
+    var result = this._super.apply(this, arguments);
     if (result.user) {
       result.user = Discourse.AdminUser.create(result.user);
     }

app/assets/javascripts/admin/models/email_log.js

@@ -10,6 +10,8 @@ Discourse.EmailLog = Discourse.Model.extend({});
 
 Discourse.EmailLog.reopenClass({
   create: function(attrs) {
+    attrs = attrs || {};
+
     if (attrs.user) {
       attrs.user = Discourse.AdminUser.create(attrs.user);
     }

app/assets/javascripts/admin/models/staff_action_log.js

@@ -43,6 +43,8 @@ Discourse.StaffActionLog = Discourse.Model.extend({
 
 Discourse.StaffActionLog.reopenClass({
   create: function(attrs) {
+    attrs = attrs || {};
+
     if (attrs.acting_user) {
       attrs.acting_user = Discourse.AdminUser.create(attrs.acting_user);
     }

app/assets/javascripts/discourse/models/invite.js

@@ -21,9 +21,8 @@ Discourse.Invite = Discourse.Model.extend({
 
 Discourse.Invite.reopenClass({
 
-  create: function(invite) {
-    var result;
-    result = this._super(invite);
+  create: function() {
+    var result = this._super.apply(this, arguments);
     if (result.user) {
       result.user = Discourse.User.create(result.user);
     }

app/assets/javascripts/discourse/models/notification.js

@@ -30,12 +30,12 @@ Discourse.Notification = Discourse.Model.extend({
 
 Discourse.Notification.reopenClass({
   create: function(obj) {
-    var result;
-    result = this._super(obj);
+    obj = obj || {};
+
     if (obj.data) {
-      result.set('data', Em.Object.create(obj.data));
+      obj.data = Em.Object.create(obj.data);
     }
-    return result;
+    return this._super(obj);
   }
 });
 

app/assets/javascripts/discourse/models/post.js

@@ -378,7 +378,7 @@ Discourse.Post.reopenClass({
   },
 
   create: function(obj) {
-    var result = this._super(obj);
+    var result = this._super.apply(this, arguments);
     this.createActionSummary(result);
     if (obj && obj.reply_to_user) {
       result.set('reply_to_user', Discourse.User.create(obj.reply_to_user));

app/assets/javascripts/discourse/models/post_stream.js

@@ -237,7 +237,7 @@ Discourse.PostStream = Em.Object.extend({
     var postWeWant = this.get('posts').findProperty('post_number', opts.nearPost);
     if (postWeWant) {
       Discourse.TopicView.jumpToPost(topic.get('id'), opts.nearPost);
-      return Ember.Deferred.create(function(p) { p.reject(); });
+      return Ember.RSVP.reject();
     }
 
     // TODO: if we have all the posts in the filter, don't go to the server for them.
@@ -301,7 +301,7 @@ Discourse.PostStream = Em.Object.extend({
   **/
   prependMore: function() {
     var postStream = this,
-        rejectedPromise = Ember.Deferred.create(function(p) { p.reject(); });
+        rejectedPromise = Ember.RSVP.reject();
 
     // Make sure we can append more posts
     if (!postStream.get('canPrependMore')) { return rejectedPromise; }
@@ -684,8 +684,8 @@ Discourse.PostStream = Em.Object.extend({
 
 Discourse.PostStream.reopenClass({
 
-  create: function(args) {
-    var postStream = this._super(args);
+  create: function() {
+    var postStream = this._super.apply(this, arguments);
     postStream.setProperties({
       posts: Em.A(),
       stream: Em.A(),

app/assets/javascripts/discourse/models/site.js

@@ -44,8 +44,8 @@ Discourse.Site.reopenClass(Discourse.Singleton, {
     return Discourse.Site.create(PreloadStore.get('site'));
   },
 
-  create: function(obj) {
-    var result = this._super(obj);
+  create: function() {
+    var result = this._super.apply(this, arguments);
 
     if (result.categories) {
       var byId = {};

app/assets/javascripts/discourse/routes/user_topic_list_routes.js

@@ -20,7 +20,7 @@ function createPMRoute(viewName, path, type) {
     },
 
     setupController: function(controller, model) {
-      this._super(controller, model);
+      this._super.apply(this, arguments);
       controller.set('hideCategories', true);
       this.controllerFor('user').setProperties({
         pmView: viewName,

app/assets/javascripts/discourse/views/topic_view.js

@@ -234,16 +234,16 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
     var info = Discourse.Eyeline.analyze(rows);
     if(!info) { return; }
 
-
     // We disable scrolling of the topic while performing initial positioning
     // This code needs to be refactored, the pipline for positioning posts is wack
     // Be sure to test on safari as well when playing with this
     if(!Discourse.TopicView.disableScroll) {
+
       // are we scrolling upwards?
       if(info.top === 0 || info.onScreen[0] === 0 || info.bottom === 0) {
-        var $body = $('body');
-        var $elem = $(rows[0]);
-        var distToElement = $body.scrollTop() - $elem.position().top;
+        var $body = $('body'),
+            $elem = $(rows[0]),
+            distToElement = $body.scrollTop() - $elem.position().top;
         this.get('postStream').prependMore().then(function() {
           Em.run.next(function () {
             $('html, body').scrollTop($elem.position().top + distToElement);
@@ -252,6 +252,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
       }
     }
 
+
     // are we scrolling down?
     var currentPost;
     if(info.bottom === rows.length-1) {

test/javascripts/admin/models/api_key_test.js

@@ -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");

test/javascripts/mixins/selected_posts_count_test.js

@@ -14,7 +14,7 @@ test("without selectedPosts", function () {
 });
 
 test("with some selectedPosts", function() {
-  var testObj = buildTestObj({ selectedPosts: [Discourse.Post.create()] });
+  var testObj = buildTestObj({ selectedPosts: [Discourse.Post.create({id: 123})] });
   equal(testObj.get('selectedPostsCount'), 1, "It returns the amount of posts");
 });
 

test/javascripts/models/email_log_test.js

@@ -0,0 +1,5 @@
+module("Discourse.EmailLog");
+
+test("create", function() {
+  ok(Discourse.EmailLog.create(), "it can be created without arguments");
+});

test/javascripts/models/invite_test.js

@@ -0,0 +1,5 @@
+module("Discourse.Invite");
+
+test("create", function() {
+  ok(Discourse.Invite.create(), "it can be created without arguments");
+});

test/javascripts/models/notification_test.js

@@ -0,0 +1,5 @@
+module("Discourse.Notification");
+
+test("create", function() {
+  ok(Discourse.Notification.create(), "it can be created without arguments");
+});

test/javascripts/models/post_stream_test.js

@@ -11,6 +11,10 @@ var buildStream = function(id, stream) {
 
 var participant = {username: 'eviltrout'};
 
+test('create', function() {
+  ok(Discourse.PostStream.create(), 'it can be created with no parameters');
+});
+
 test('defaults', function() {
   var postStream = buildStream(1234);
   blank(postStream.get('posts'), "there are no posts in a stream by default");

test/javascripts/models/site_test.js

@@ -1,6 +1,10 @@
 module("Discourse.Site");
 
-test('instance', function(){
+test('create', function() {
+  ok(Discourse.Site.create(), 'it can create with no parameters');
+});
+
+test('instance', function() {
 
   var site = Discourse.Site.current();
 
@@ -32,5 +36,4 @@ test('create categories', function() {
   present(subcategory, "it loaded the subcategory");
   equal(subcategory.get('parentCategory'), parent, "it has associated the child with the parent");
 
-
 });

test/javascripts/models/staff_action_log_test.js

@@ -0,0 +1,5 @@
+module("Discourse.StaffActionLog");
+
+test("create", function() {
+  ok(Discourse.StaffActionLog.create(), "it can be created without arguments");
+});