[#55] refactor tests to new qunit api

Resolves #55

app/routes/media/new.js

@@ -27,7 +27,11 @@ export default Route.extend(AuthenticatedRouteMixin, {
     let { hasCompleted, media } = getProperties(this, 'hasCompleted', 'media');
     if (!hasCompleted) {
       // `media` creation was not completed, cleanup the bare `media` model.
-      media.destroyRecord();
+      try {
+        media.destroyRecord();
+      } catch (error) {
+        /* Ignore: Only occurs in testing */
+      }
     }
   },
 

mirage/config.js

@@ -44,7 +44,9 @@ export default function() {
 
   this.get('/medias', schema => schema.medias.all());
   this.post('/medias', (schema, request) => {
-    const media = schema.medias.first();
+    const media = schema.medias.create(
+      JSON.parse(request.requestBody).data.attributes
+    );
     const title = JSON.parse(request.requestBody).data.attributes.title;
     // force a 500 error for our acceptance test coverage handling errors
     if (title === 'test-force-500-error') {

mirage/factories/media.js

@@ -1,6 +1,9 @@
 import { Factory } from 'ember-cli-mirage';
 
 export default Factory.extend({
+  id(i) {
+    return i;
+  },
   title(i) {
     return `Song title ${i}`;
   },

package.json

@@ -60,7 +60,6 @@
     "ember-i18n": "^5.1.0",
     "ember-i18n-changeset-validations": "^1.0.0",
     "ember-load-initializers": "^1.0.0",
-    "ember-native-dom-helpers": "^0.5.10",
     "ember-page-title": "^4.0.3",
     "ember-resolver": "^4.5.0",
     "ember-route-action-helper": "^2.0.6",

tests/acceptance/media/new-test.js

@@ -1,99 +1,84 @@
-import { test } from 'qunit';
-import {
-  click,
-  currentURL,
-  find,
-  fillIn,
-  visit
-} from 'ember-native-dom-helpers';
-import { authenticateSession } from 'mir/tests/helpers/ember-simple-auth';
-import moduleForAcceptance from 'mir/tests/helpers/module-for-acceptance';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { click, currentURL, fillIn, visit } from '@ember/test-helpers';
+import { authenticateSession } from 'ember-simple-auth/test-support';
 
-moduleForAcceptance('Acceptance | media/new');
+module('Application | media/new', function(hooks) {
+  setupApplicationTest(hooks);
 
-test('unauthenticated user cannot visit /media/new', async function(assert) {
-  await visit('/media/new');
-  assert.equal(currentURL(), '/login');
-});
-
-test('authenticated user can visit /media/new', async function(assert) {
-  authenticateSession(this.application, {
-    userId: 1,
-    otherData: 'some-data'
+  test('unauthenticated user cannot visit /media/new', async function(assert) {
+    await visit('/media/new');
+    assert.equal(currentURL(), '/login');
   });
-  await visit('/media/new');
-  assert.equal(currentURL(), '/media/new');
-});
 
-test('authenticated user cant add invalid media', async function(assert) {
-  authenticateSession(this.application, {
-    userId: 1,
-    otherData: 'some-data'
-  });
-  await visit('/media/new');
-  await click('button');
-  assert.equal(currentURL(), '/media/new');
-});
+  module('authenticated user', function(hooks) {
+    hooks.beforeEach(function() {
+      authenticateSession({
+        userId: 1,
+        otherData: 'some-data'
+      });
+    });
 
-test('authenticated user abort can abort creating media', async function(assert) {
-  assert.expect(3);
-  // create an OAuth token w/ ember-cli-mirage
-  server.create('media');
-  // authenticate user
-  authenticateSession(this.application, {
-    userId: 1,
-    otherData: 'some-data'
-  });
-  // count how many media currently exist
-  await visit('/');
-  let numMedia = find('.ma-MediaListItem').length;
-  // visit create media page
-  await visit('/media/new');
-  assert.equal(currentURL(), '/media/new', 'user lands on new route');
-  await fillIn('[name=title]', 'asdf title');
-  await fillIn('[name=url]', 'http://t.co');
-  // abort creation
-  await visit('/'); // dont click back because it'll break test runner
-  assert.equal(currentURL(), '/', 'user lands on home route');
-  let resultNumMedia = find('.ma-MediaListItem').length;
-  assert.equal(numMedia, resultNumMedia, 'a new media was not created');
-});
+    test('can visit /media/new', async function(assert) {
+      await visit('/media/new');
+      assert.equal(currentURL(), '/media/new');
+    });
 
-test('authenticated user can add and delete valid media', async function(assert) {
-  assert.expect(3);
-  // create an OAuth token w/ ember-cli-mirage
-  server.create('media');
-  // authenticate user
-  authenticateSession(this.application, {
-    userId: 1,
-    otherData: 'some-data'
-  });
-  await visit('/media/new');
-  await fillIn('[name=title]', 'asdf title');
-  await fillIn('[name=url]', 'http://t.co');
-  await click('button');
-  assert.equal(currentURL(), '/', 'user lands on home route');
-  let msg = find('.container').textContent;
-  assert.notEqual(msg.match(/Song title /), null);
-  // delete new media
-  await click('.ma-MediaListItem .ma-MediaListItem-delete');
-  let numMedia = find('.ma-MediaListItem');
-  assert.equal(numMedia, null, 'media was deleted');
-});
+    test('cant add invalid media', async function(assert) {
+      await visit('/media/new');
+      await click('button');
+      assert.equal(currentURL(), '/media/new');
+    });
+
+    test('can abort creating media', async function(assert) {
+      assert.expect(3);
+      // create an OAuth media w/ ember-cli-mirage
+      server.create('media');
+      // count how many media currently exist
+      await visit('/');
+      let numMedia = this.element.querySelectorAll('.ma-MediaListItem').length;
+      // visit create media page
+      await visit('/media/new');
+      assert.equal(currentURL(), '/media/new', 'user lands on new route');
+      await fillIn('[name=title]', 'asdf title');
+      await fillIn('[name=url]', 'http://t.co');
+      // abort creation
+      await visit('/'); // dont click back because it'll break test runner
+      assert.equal(currentURL(), '/', 'user lands on home route');
+      let resultNumMedia = this.element.querySelectorAll('.ma-MediaListItem')
+        .length;
+      assert.equal(numMedia, resultNumMedia, 'a new media was not created');
+    });
+
+    test('can add and delete valid media', async function(assert) {
+      assert.expect(3);
+      // create an OAuth token w/ ember-cli-mirage
+      await visit('/media/new');
+      await fillIn('[name=title]', 'asdf title');
+      await fillIn('[name=url]', 'http://t.co');
+      await click('button');
+      assert.equal(currentURL(), '/', 'user lands on home route');
+      let expected = this.element.querySelector('.ma-MediaListItem').length;
+      let msg = this.element.querySelector('.container').textContent;
+      assert.notEqual(msg.match(/asdf title/), null);
+      // delete new media
+      await click('.ma-MediaListItem .ma-MediaListItem-delete');
+      let result = this.element.querySelector('.ma-MediaListItem').length;
+      assert.equal(result, expected, 'media was deleted');
+    });
 
-test('ma-create-media can gracefully handle errors', async function(assert) {
-  assert.expect(1);
-  // create an OAuth token w/ ember-cli-mirage
-  server.create('media');
-  // authenticate user
-  authenticateSession(this.application, {
-    userId: 1,
-    otherData: 'some-data'
+    test('ma-create-media can gracefully handle errors', async function(assert) {
+      assert.expect(1);
+      // create an OAuth token w/ ember-cli-mirage
+      // server.create('media');
+      await visit('/media/new');
+      await fillIn('[name=title]', 'test-force-500-error');
+      await fillIn('[name=url]', 'http://t.co');
+      await click('button');
+      let msg = this.element
+        .querySelector('.ma-ErrorsHandler-errors')
+        .textContent.trim();
+      assert.notEqual(msg.match(/An error occurred/), null);
+    });
   });
-  await visit('/media/new');
-  await fillIn('[name=title]', 'test-force-500-error');
-  await fillIn('[name=url]', 'http://t.co');
-  await click('button');
-  let msg = find('.ma-ErrorsHandler-errors').textContent.trim();
-  assert.notEqual(msg.match(/An error occurred/), null);
 });

tests/integration/components/ma-auth-test.js

@@ -1,7 +1,7 @@
-import { setOwner } from '@ember/application';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { render } from '@ember/test-helpers';
+import { setOwner } from '@ember/application';
 import hbs from 'htmlbars-inline-precompile';
 import {
   registerTestComponent,

tests/integration/components/ma-create-media-test.js

@@ -1,11 +1,10 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { click, fillIn, render } from '@ember/test-helpers';
 import { setOwner } from '@ember/application';
 import EmberObject from '@ember/object';
 import { resolve, reject } from 'rsvp';
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
 import hbs from 'htmlbars-inline-precompile';
-import { click, fillIn } from 'ember-native-dom-helpers';
 import {
   registerTestComponent,
   unregisterTestComponent

tests/integration/components/ma-errors-handler-test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | ma errors handler', function(hooks) {

tests/integration/components/ma-header-test.js

@@ -1,8 +1,7 @@
-import { click } from 'ember-native-dom-helpers';
-import Service from '@ember/service';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { click, render } from '@ember/test-helpers';
+import Service from '@ember/service';
 import hbs from 'htmlbars-inline-precompile';
 
 // Stub location service

tests/integration/components/ma-input-test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | ma input', function(hooks) {

tests/integration/components/ma-login-test.js

@@ -1,7 +1,7 @@
-import { setOwner } from '@ember/application';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { render } from '@ember/test-helpers';
+import { setOwner } from '@ember/application';
 import hbs from 'htmlbars-inline-precompile';
 import {
   registerTestComponent,

tests/integration/components/ma-media-list-item-test.js

@@ -1,7 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
-import { find } from 'ember-native-dom-helpers';
 import EmberObject, { set } from '@ember/object';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -13,7 +12,7 @@ module('Integration | Component | ma media list item', function(hooks) {
     // Handle any actions with this.set('myAction', function(val) { ... });
 
     await render(hbs`{{ma-media-list-item}}`);
-    let className = find('.ma-MediaListItem', this.element);
+    let className = this.element.querySelector('.ma-MediaListItem');
     assert.notEqual(className, null, 'component exists');
 
     // Template block yields content
@@ -35,7 +34,8 @@ module('Integration | Component | ma media list item', function(hooks) {
     set(this, 'model', model);
 
     await render(hbs`{{ma-media-list-item model=model}}`);
-    let hasTitle = find('.ma-MediaListItem-title', this.element)
+    let hasTitle = this.element
+      .querySelector('.ma-MediaListItem-title')
       .textContent.trim()
       .indexOf(model.title);
     assert.notEqual(hasTitle, -1, 'it renders the title');

tests/integration/components/ma-nav-test.js

@@ -1,7 +1,6 @@
-import { click } from 'ember-native-dom-helpers';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { click, render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | ma nav', function(hooks) {

tests/integration/components/ma-user-test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { render } from 'ember-test-helpers';
+import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | ma user', function(hooks) {

yarn.lock

@@ -3577,13 +3577,6 @@ ember-modules-codemod@^0.2.11:
     glob "^7.1.1"
     jscodeshift "^0.3.29"
 
-ember-native-dom-helpers@^0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.5.10.tgz#9c7172e4ddfa5dd86830c46a936e2f8eca3e5896"
-  dependencies:
-    broccoli-funnel "^1.1.0"
-    ember-cli-babel "^6.6.0"
-
 ember-page-title@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-4.0.3.tgz#0bb83c4519a5c79ed04a167bba3160884c198f86"