Use native todo from QUnit

emberjs · Jun 10, 2019 · bfdf503 · bfdf503
1 parent 939d4a3
commit bfdf503
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 109 deletions.
diff --git a/packages/-ember-data/tests/acceptance/relationships/belongs-to-test.js b/packages/-ember-data/tests/acceptance/relationships/belongs-to-test.js
@@ -1,4 +1,4 @@
-import { module, test, skip } from 'qunit';
+import { module, test, todo } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model from '@ember-data/model';
@@ -374,7 +374,7 @@ module('async belongs-to rendering tests', function(hooks) {
       assert.equal(this.element.textContent.trim(), 'Kevin has two children and one parent');
     });
 
-    skip('Rendering an async belongs-to whose fetch fails does not trigger a new request', async function(assert) {
+    todo('Rendering an async belongs-to whose fetch fails does not trigger a new request', async function(assert) {
       assert.expect(15);
       let people = makePeopleWithRelationshipData();
       let sedona = store.push({

diff --git a/packages/-ember-data/tests/acceptance/relationships/has-many-test.js b/packages/-ember-data/tests/acceptance/relationships/has-many-test.js
@@ -1,4 +1,4 @@
-import { module, test, skip } from 'qunit';
+import { module, test, todo } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import Model from '@ember-data/model';
@@ -287,7 +287,7 @@ module('async has-many rendering tests', function(hooks) {
       );
     });
 
-    skip('Rendering an async hasMany whose fetch fails does not trigger a new request', async function(assert) {
+    todo('Rendering an async hasMany whose fetch fails does not trigger a new request', async function(assert) {
       assert.expect(12);
       let people = makePeopleWithRelationshipData();
       let parent = store.push({
@@ -444,7 +444,7 @@ module('async has-many rendering tests', function(hooks) {
       );
     });
 
-    skip('Rendering an async hasMany with a link whose fetch fails does not trigger a new request', async function(assert) {
+    todo('Rendering an async hasMany with a link whose fetch fails does not trigger a new request', async function(assert) {
       assert.expect(12);
       let people = makePeopleWithRelationshipLinks(true);
       let parent = store.push({

diff --git a/packages/-ember-data/tests/helpers/todo.js b/packages/-ember-data/tests/helpers/todo.js
diff --git a/packages/-ember-data/tests/integration/records/load-test.js b/packages/-ember-data/tests/integration/records/load-test.js
@@ -1,12 +1,11 @@
-import { module, test } from 'qunit';
+import { module, test, todo } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { reject, resolve } from 'rsvp';
 import Store from '@ember-data/store';
 import Model from '@ember-data/model';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 import { run } from '@ember/runloop';
-import todo from '../../helpers/todo';
 import { attr, belongsTo } from '@ember-data/model';
 
 class Person extends Model {

diff --git a/packages/-ember-data/tests/integration/relationships/has-many-test.js b/packages/-ember-data/tests/integration/relationships/has-many-test.js
@@ -6,7 +6,7 @@ import { get } from '@ember/object';
 import { run } from '@ember/runloop';
 import setupStore from 'dummy/tests/helpers/store';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
-import { module, test, skip } from 'qunit';
+import { module, test, todo } from 'qunit';
 import { relationshipStateFor, relationshipsFor } from 'ember-data/-private';
 import DS from 'ember-data';
 
@@ -955,7 +955,7 @@ module('integration/relationships/has_many - Has-Many Relationships', function(h
     });
   });
 
-  skip('A hasMany relationship can be reloaded even if it failed at the first time', async function(assert) {
+  todo('A hasMany relationship can be reloaded even if it failed at the first time', async function(assert) {
     assert.expect(6);
 
     const { store, adapter } = env;
@@ -2135,7 +2135,7 @@ module('integration/relationships/has_many - Has-Many Relationships', function(h
     );
   });
 
-  skip('A sync hasMany errors out if there are unloaded records in it', function(assert) {
+  todo('A sync hasMany errors out if there are unloaded records in it', function(assert) {
     let post = run(() => {
       env.store.push({
         data: {

diff --git a/packages/-ember-data/tests/integration/relationships/many-to-many-test.js b/packages/-ember-data/tests/integration/relationships/many-to-many-test.js
@@ -4,8 +4,7 @@ import { resolve, Promise as EmberPromise } from 'rsvp';
 import { run } from '@ember/runloop';
 import { get } from '@ember/object';
 import setupStore from 'dummy/tests/helpers/store';
-import { module, test } from 'qunit';
-import todo from '../../helpers/todo';
+import { module, test, todo } from 'qunit';
 import DS from 'ember-data';
 
 const { attr, hasMany } = DS;

diff --git a/packages/-ember-data/tests/unit/model/relationships/has-many-test.js b/packages/-ember-data/tests/unit/model/relationships/has-many-test.js
@@ -3,9 +3,8 @@ import { get, observer } from '@ember/object';
 import { run } from '@ember/runloop';
 import setupStore from 'dummy/tests/helpers/store';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
-import { module, test } from 'qunit';
+import { module, test, todo } from 'qunit';
 import DS from 'ember-data';
-import todo from '../../../helpers/todo';
 
 let env;