From 1a3b63e07dcdfa3e0066b69cf8a969eee8826378 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 29 Apr 2016 16:50:52 -0400
Subject: [PATCH] `createWithMixins` is deprecated.

---
 app/assets/javascripts/discourse.js                      | 4 ++--
 app/assets/javascripts/discourse/lib/url.js.es6          | 5 ++---
 test/javascripts/mixins/selected-posts-count-test.js.es6 | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 36a73256d..063b805a4 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -8,7 +8,7 @@ define('ember', ['exports'], function(__exports__) {
 
 var _pluginCallbacks = [];
 
-window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
+window.Discourse = Ember.Application.extend(Discourse.Ajax, {
   rootElement: '#main',
   _docTitle: document.title,
   __TAGS_INCLUDED__: true,
@@ -168,7 +168,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
       return this.get("currentAssetVersion");
     }
   })
-});
+}).create();
 
 function RemovedObject(name) {
   this._removedName = name;
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index e0074df05..50ef5e45f 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -2,7 +2,7 @@
 let _jumpScheduled = false;
 const rewrites = [];
 
-const DiscourseURL = Ember.Object.createWithMixins({
+const DiscourseURL = Ember.Object.extend({
 
   // Used for matching a topic
   TOPIC_REGEXP: /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/,
@@ -327,7 +327,6 @@ const DiscourseURL = Ember.Object.createWithMixins({
       }
     });
   }
-
-});
+}).create();
 
 export default DiscourseURL;
diff --git a/test/javascripts/mixins/selected-posts-count-test.js.es6 b/test/javascripts/mixins/selected-posts-count-test.js.es6
index b07122fc5..c6233a52a 100644
--- a/test/javascripts/mixins/selected-posts-count-test.js.es6
+++ b/test/javascripts/mixins/selected-posts-count-test.js.es6
@@ -4,7 +4,7 @@ import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
 import Topic from 'discourse/models/topic';
 
 var buildTestObj = function(params) {
-  return Ember.Object.createWithMixins(SelectedPostsCount, params || {});
+  return Ember.Object.extend(SelectedPostsCount).create(params || {});
 };
 
 test("without selectedPosts", function () {