Merge pull request #4164 from pangratz/string-theory

[CLEANUP] remove `toString` definitions for models in tests
emberjs · Feb 16, 2016 · f4d3b9e · f4d3b9e
2 parents 6a9e096 + 377e7f1
commit f4d3b9e
Show file tree

Hide file tree

Showing 26 changed files with 0 additions and 132 deletions.
diff --git a/tests/integration/adapter/build-url-mixin-test.js b/tests/integration/adapter/build-url-mixin-test.js
@@ -15,10 +15,6 @@ module("integration/adapter/build-url-mixin - BuildURLMixin with RESTAdapter", {
       name: DS.attr("string")
     });
 
-    Post.toString = function() {
-      return "Post";
-    };
-
     Comment = DS.Model.extend({
       name: DS.attr("string")
     });

diff --git a/tests/integration/adapter/record-persistence-test.js b/tests/integration/adapter/record-persistence-test.js
@@ -22,7 +22,6 @@ module("integration/adapter/record_persistence - Persisting Records", {
       firstName: attr('string'),
       lastName: attr('string')
     });
-    Person.toString = function() { return "Person"; };
 
     env = setupStore({
       adapter: DS.Adapter.extend({

diff --git a/tests/integration/adapter/rest-adapter-test.js b/tests/integration/adapter/rest-adapter-test.js
@@ -17,10 +17,6 @@ module("integration/adapter/rest_adapter - REST Adapter", {
       name: DS.attr("string")
     });
 
-    Post.toString = function() {
-      return "Post";
-    };
-
     Comment = DS.Model.extend({
       name: DS.attr("string")
     });

diff --git a/tests/integration/debug-adapter-test.js b/tests/integration/debug-adapter-test.js
@@ -12,7 +12,6 @@ module("DS.DebugAdapter", {
   beforeEach() {
     Ember.run(function() {
       App = Ember.Application.create();
-      App.toString = function() { return 'App'; };
 
       App.StoreService = DS.Store.extend({});
 

diff --git a/tests/integration/record-array-manager-test.js b/tests/integration/record-array-manager-test.js
@@ -13,16 +13,12 @@ var Person = DS.Model.extend({
   cars: DS.hasMany('car', { async: false })
 });
 
-Person.toString = function() { return "Person"; };
-
 var Car = DS.Model.extend({
   make: DS.attr('string'),
   model: DS.attr('string'),
   person: DS.belongsTo('person', { async: false })
 });
 
-Car.toString = function() { return "Car"; };
-
 var manager;
 
 module("integration/record_array_manager", {

diff --git a/tests/integration/records/collection-save-test.js b/tests/integration/records/collection-save-test.js
@@ -14,8 +14,6 @@ module("integration/records/collection_save - Save Collection of Records", {
       title: DS.attr('string')
     });
 
-    Post.toString = function() { return "Post"; };
-
     env = setupStore({ post: Post });
   },
 

diff --git a/tests/integration/records/delete-record-test.js b/tests/integration/records/delete-record-test.js
@@ -15,8 +15,6 @@ module("integration/deletedRecord - Deleting Records", {
       name: attr('string')
     });
 
-    Person.toString = function() { return "Person"; };
-
     env = setupStore({
       person: Person
     });

diff --git a/tests/integration/records/error-test.js b/tests/integration/records/error-test.js
@@ -13,7 +13,6 @@ module('integration/records/error', {
       firstName: attr('string'),
       lastName: attr('string')
     });
-    Person.toString = function() { return 'Person'; };
 
     env = setupStore({
       person: Person

diff --git a/tests/integration/records/load-test.js b/tests/integration/records/load-test.js
@@ -17,9 +17,6 @@ module("integration/load - Loading Records", {
 
     Comment = DS.Model.extend();
 
-    Post.toString = function() { return "Post"; };
-    Comment.toString = function() { return "Comment"; };
-
     env = setupStore({ post: Post, comment: Comment });
   },
 

diff --git a/tests/integration/records/property-changes-test.js b/tests/integration/records/property-changes-test.js
@@ -15,7 +15,6 @@ module('integration/records/property-changes - Property changes', {
       firstName: attr('string'),
       lastName: attr('string')
     });
-    Person.toString = function() { return 'Person'; };
 
     env = setupStore({
       person: Person

diff --git a/tests/integration/records/reload-test.js b/tests/integration/records/reload-test.js
@@ -19,8 +19,6 @@ module("integration/reload - Reloading Records", {
       lastName: attr('string')
     });
 
-    Person.toString = function() { return "Person"; };
-
     env = setupStore({ person: Person });
   },
 

diff --git a/tests/integration/records/save-test.js b/tests/integration/records/save-test.js
@@ -14,8 +14,6 @@ module("integration/records/save - Save Record", {
       title: DS.attr('string')
     });
 
-    Post.toString = function() { return "Post"; };
-
     env = setupStore({ post: Post });
   },
 

diff --git a/tests/integration/records/unload-test.js b/tests/integration/records/unload-test.js
@@ -16,22 +16,16 @@ var Person = DS.Model.extend({
   cars: hasMany('car', { async: false })
 });
 
-Person.toString = function() { return "Person"; };
-
 var Group = DS.Model.extend({
   people: hasMany('person', { async: false })
 });
 
-Group.toString = function() { return "Group"; };
-
 var Car = DS.Model.extend({
   make: attr('string'),
   model: attr('string'),
   person: belongsTo('person', { async: false })
 });
 
-Car.toString = function() { return "Car"; };
-
 module("integration/unload - Unloading Records", {
   beforeEach() {
     env = setupStore({

diff --git a/tests/integration/relationships/has-many-test.js b/tests/integration/relationships/has-many-test.js
@@ -15,10 +15,6 @@ var attr = DS.attr;
 var hasMany = DS.hasMany;
 var belongsTo = DS.belongsTo;
 
-function stringify(string) {
-  return function() { return string; };
-}
-
 module("integration/relationships/has_many - Has-Many Relationships", {
   beforeEach() {
     User = DS.Model.extend({
@@ -43,37 +39,31 @@ module("integration/relationships/has_many - Has-Many Relationships", {
       user: belongsTo('user', { async: false }),
       created_at: attr('date')
     });
-    Message.toString = stringify('Message');
 
     Post = Message.extend({
       title: attr('string'),
       comments: hasMany('comment', { async: false })
     });
-    Post.toString = stringify('Post');
 
     Comment = Message.extend({
       body: DS.attr('string'),
       message: DS.belongsTo('post', { polymorphic: true, async: true })
     });
-    Comment.toString = stringify('Comment');
 
     Book = DS.Model.extend({
       title: attr(),
       chapters: hasMany('chapter', { async: true })
     });
-    Book.toString = stringify('Book');
 
     Chapter = DS.Model.extend({
       title: attr(),
       pages: hasMany('page', { async: false })
     });
-    Chapter.toString = stringify('Chapter');
 
     Page = DS.Model.extend({
       number: attr('number'),
       chapter: belongsTo('chapter', { async: false })
     });
-    Page.toString = stringify('Page');
 
     env = setupStore({
       user: User,

diff --git a/tests/integration/relationships/many-to-many-test.js b/tests/integration/relationships/many-to-many-test.js
@@ -11,10 +11,6 @@ var run = Ember.run;
 var attr = DS.attr;
 var hasMany = DS.hasMany;
 
-function stringify(string) {
-  return function() { return string; };
-}
-
 module('integration/relationships/many_to_many_test - ManyToMany relationships', {
   beforeEach() {
     User = DS.Model.extend({
@@ -23,22 +19,16 @@ module('integration/relationships/many_to_many_test - ManyToMany relationships',
       accounts: hasMany('account', { async: false })
     });
 
-    User.toString = stringify('User');
-
     Account = DS.Model.extend({
       state: attr(),
       users: hasMany('user', { async: false })
     });
 
-    Account.toString = stringify('Account');
-
     Topic = DS.Model.extend({
       title: attr('string'),
       users: hasMany('user', { async: true })
     });
 
-    Topic.toString = stringify('Topic');
-
     env = setupStore({
       user: User,
       topic: Topic,

diff --git a/tests/integration/relationships/one-to-many-test.js b/tests/integration/relationships/one-to-many-test.js
@@ -13,30 +13,23 @@ var attr = DS.attr;
 var hasMany = DS.hasMany;
 var belongsTo = DS.belongsTo;
 
-function stringify(string) {
-  return function() { return string; };
-}
-
 module('integration/relationships/one_to_many_test - OneToMany relationships', {
   beforeEach() {
     User = DS.Model.extend({
       name: attr('string'),
       messages: hasMany('message', { async: true }),
       accounts: hasMany('account', { async: false })
     });
-    User.toString = stringify('User');
 
     Account = DS.Model.extend({
       state: attr(),
       user: belongsTo('user', { async: false })
     });
-    Account.toString = stringify('Account');
 
     Message = DS.Model.extend({
       title: attr('string'),
       user: belongsTo('user', { async: true })
     });
-    Message.toString = stringify('Message');
 
     env = setupStore({
       user: User,

diff --git a/tests/integration/relationships/one-to-one-test.js b/tests/integration/relationships/one-to-one-test.js
@@ -11,24 +11,18 @@ var run = Ember.run;
 var attr = DS.attr;
 var belongsTo = DS.belongsTo;
 
-function stringify(string) {
-  return function() { return string; };
-}
-
 module('integration/relationships/one_to_one_test - OneToOne relationships', {
   beforeEach() {
     User = DS.Model.extend({
       name: attr('string'),
       bestFriend: belongsTo('user', { async: true, inverse: 'bestFriend' }),
       job: belongsTo('job', { async: false })
     });
-    User.toString = stringify('User');
 
     Job = DS.Model.extend({
       isGood: attr(),
       user: belongsTo('user', { async: false })
     });
-    Job.toString = stringify('Job');
 
     env = setupStore({
       user: User,

diff --git a/tests/integration/relationships/polymorphic-mixins-belongs-to-test.js b/tests/integration/relationships/polymorphic-mixins-belongs-to-test.js
@@ -11,23 +11,17 @@ var run = Ember.run;
 var attr = DS.attr;
 var belongsTo = DS.belongsTo;
 
-function stringify(string) {
-  return function() { return string; };
-}
-
 module('integration/relationships/polymorphic_mixins_belongs_to_test - Polymorphic belongsTo relationships with mixins', {
   beforeEach() {
     User = DS.Model.extend({
       name: attr('string'),
       bestMessage: belongsTo('message', { async: true, polymorphic: true })
     });
-    User.toString = stringify('User');
 
     Message = Ember.Mixin.create({
       title: attr('string'),
       user: belongsTo('user', { async: true })
     });
-    Message.toString = stringify('Message');
 
     NotMessage = DS.Model.extend({
       video: attr()

diff --git a/tests/integration/relationships/polymorphic-mixins-has-many-test.js b/tests/integration/relationships/polymorphic-mixins-has-many-test.js
@@ -12,23 +12,17 @@ var attr = DS.attr;
 var hasMany = DS.hasMany;
 var belongsTo = DS.belongsTo;
 
-function stringify(string) {
-  return function() { return string; };
-}
-
 module('integration/relationships/polymorphic_mixins_has_many_test - Polymorphic hasMany relationships with mixins', {
   beforeEach() {
     User = DS.Model.extend({
       name: attr('string'),
       messages: hasMany('message', { async: true, polymorphic: true })
     });
-    User.toString = stringify('User');
 
     Message = Ember.Mixin.create({
       title: attr('string'),
       user: belongsTo('user', { async: true })
     });
-    Message.toString = stringify('Message');
 
     Video = DS.Model.extend(Message, {
       video: attr()

diff --git a/tests/integration/store-test.js b/tests/integration/store-test.js
@@ -14,16 +14,12 @@ var Person = DS.Model.extend({
 
 var run = Ember.run;
 
-Person.toString = function() { return "Person"; };
-
 var Car = DS.Model.extend({
   make: DS.attr('string'),
   model: DS.attr('string'),
   person: DS.belongsTo('person', { async: false })
 });
 
-Car.toString = function() { return "Car"; };
-
 function initializeStore(adapter) {
   env = setupStore({
     adapter: adapter

diff --git a/tests/unit/many-array-test.js b/tests/unit/many-array-test.js
@@ -19,17 +19,11 @@ module("unit/many_array - DS.ManyArray", {
       title: attr('string'),
       tags: hasMany('tag', { async: false })
     });
-    Post.toString = function() {
-      return 'Post';
-    };
 
     Tag = DS.Model.extend({
       name: attr('string'),
       post: belongsTo('post', { async: false })
     });
-    Tag.toString = function() {
-      return 'Tag';
-    };
 
     env = setupStore({
       post: Post,