Ember update (#5386)

Ember update - update ember-cli, ember-data, and ember to 3.4 series

ui/tests/integration/components/kv-object-editor-test.js

@@ -1,5 +1,6 @@
-import { moduleForComponent, test } from 'ember-qunit';
-import wait from 'ember-test-helpers/wait';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 import { create } from 'ember-cli-page-object';
@@ -8,84 +9,79 @@ import kvObjectEditor from '../../pages/components/kv-object-editor';
 import sinon from 'sinon';
 const component = create(kvObjectEditor);
 
-moduleForComponent('kv-object-editor', 'Integration | Component | kv object editor', {
-  integration: true,
-  beforeEach() {
+module('Integration | Component | kv object editor', function(hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function() {
     component.setContext(this);
-  },
-
-  afterEach() {
-    component.removeContext();
-  },
-});
-
-test('it renders with no initial value', function(assert) {
-  let spy = sinon.spy();
-  this.set('onChange', spy);
-  this.render(hbs`{{kv-object-editor onChange=onChange}}`);
-  assert.equal(component.rows().count, 1, 'renders a single row');
-  component.addRow();
-  return wait().then(() => {
-    assert.equal(component.rows().count, 1, 'will only render row with a blank key');
   });
-});
 
-test('it calls onChange when the val changes', function(assert) {
-  let spy = sinon.spy();
-  this.set('onChange', spy);
-  this.render(hbs`{{kv-object-editor onChange=onChange}}`);
-  component.rows(0).kvKey('foo').kvVal('bar');
-  wait().then(() => {
+  hooks.afterEach(function() {
+    component.removeContext();
+  });
+
+  test('it renders with no initial value', async function(assert) {
+    let spy = sinon.spy();
+    this.set('onChange', spy);
+    await render(hbs`{{kv-object-editor onChange=onChange}}`);
+    assert.equal(component.rows.length, 1, 'renders a single row');
+    await component.addRow();
+    assert.equal(component.rows.length, 1, 'will only render row with a blank key');
+  });
+
+  test('it calls onChange when the val changes', async function(assert) {
+    let spy = sinon.spy();
+    this.set('onChange', spy);
+    await render(hbs`{{kv-object-editor onChange=onChange}}`);
+    await component.rows
+      .objectAt(0)
+      .kvKey('foo')
+      .kvVal('bar');
     assert.equal(spy.callCount, 2, 'calls onChange each time change is triggered');
     assert.deepEqual(
       spy.lastCall.args[0],
       { foo: 'bar' },
       'calls onChange with the JSON respresentation of the data'
     );
+    await component.addRow();
+    assert.equal(component.rows.length, 2, 'adds a row when there is no blank one');
   });
-  component.addRow();
-  return wait().then(() => {
-    assert.equal(component.rows().count, 2, 'adds a row when there is no blank one');
+
+  test('it renders passed data', async function(assert) {
+    let metadata = { foo: 'bar', baz: 'bop' };
+    this.set('value', metadata);
+    await render(hbs`{{kv-object-editor value=value}}`);
+    assert.equal(
+      component.rows.length,
+      Object.keys(metadata).length + 1,
+      'renders both rows of the metadata, plus an empty one'
+    );
   });
-});
 
-test('it renders passed data', function(assert) {
-  let metadata = { foo: 'bar', baz: 'bop' };
-  this.set('value', metadata);
-  this.render(hbs`{{kv-object-editor value=value}}`);
-  assert.equal(
-    component.rows().count,
-    Object.keys(metadata).length + 1,
-    'renders both rows of the metadata, plus an empty one'
-  );
-});
-
-test('it deletes a row', function(assert) {
-  let spy = sinon.spy();
-  this.set('onChange', spy);
-  this.render(hbs`{{kv-object-editor onChange=onChange}}`);
-  component.rows(0).kvKey('foo').kvVal('bar');
-  component.addRow();
-  wait().then(() => {
-    assert.equal(component.rows().count, 2);
+  test('it deletes a row', async function(assert) {
+    let spy = sinon.spy();
+    this.set('onChange', spy);
+    await render(hbs`{{kv-object-editor onChange=onChange}}`);
+    await component.rows
+      .objectAt(0)
+      .kvKey('foo')
+      .kvVal('bar');
+    await component.addRow();
+    assert.equal(component.rows.length, 2);
     assert.equal(spy.callCount, 2, 'calls onChange for editing');
-    component.rows(0).deleteRow();
-  });
+    await component.rows.objectAt(0).deleteRow();
 
-  return wait().then(() => {
-    assert.equal(component.rows().count, 1, 'only the blank row left');
+    assert.equal(component.rows.length, 1, 'only the blank row left');
     assert.equal(spy.callCount, 3, 'calls onChange deleting row');
     assert.deepEqual(spy.lastCall.args[0], {}, 'last call to onChange is an empty object');
   });
-});
 
-test('it shows a warning if there are duplicate keys', function(assert) {
-  let metadata = { foo: 'bar', baz: 'bop' };
-  this.set('value', metadata);
-  this.render(hbs`{{kv-object-editor value=value}}`);
-  component.rows(0).kvKey('foo');
+  test('it shows a warning if there are duplicate keys', async function(assert) {
+    let metadata = { foo: 'bar', baz: 'bop' };
+    this.set('value', metadata);
+    await render(hbs`{{kv-object-editor value=value}}`);
+    await component.rows.objectAt(0).kvKey('foo');
 
-  return wait().then(() => {
     assert.ok(component.showsDuplicateError, 'duplicate keys are allowed but an error message is shown');
   });
 });