Update dependency ember-mocha to v0.16.0

no issue

- removes now-unneeded `adapter-error` override helper
- comments out the `gh-post-settings-menu` unit tests because the top-level `describe.skip` was causing all further unit tests to be skipped

package.json

@@ -78,7 +78,7 @@
     "ember-infinity": "1.4.7",
     "ember-load": "0.0.17",
     "ember-load-initializers": "2.0.0",
-    "ember-mocha": "0.15.1",
+    "ember-mocha": "0.16.0",
     "ember-moment": "7.8.1",
     "ember-one-way-select": "4.0.0",
     "ember-power-calendar-moment": "0.1.7",

tests/acceptance/settings/tags-test.js

@@ -4,7 +4,6 @@ import {Response} from 'ember-cli-mirage';
 import {afterEach, beforeEach, describe, it} from 'mocha';
 import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
 import {blur, click, currentRouteName, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-import {errorOverride, errorReset} from 'ghost-admin/tests/helpers/adapter-error';
 import {expect} from 'chai';
 import {run} from '@ember/runloop';
 import {setupApplicationTest} from 'ember-mocha';
@@ -312,11 +311,8 @@ describe('Acceptance: Settings - Tags', function () {
                 return new Response(404, {'Content-Type': 'application/json'}, {errors: [{message: 'Tag not found.', type: 'NotFoundError'}]});
             });
 
-            errorOverride();
-
             await visit('settings/tags/unknown');
 
-            errorReset();
             expect(currentRouteName()).to.equal('error404');
             expect(currentURL()).to.equal('/settings/tags/unknown');
         });

tests/acceptance/staff-test.js

@@ -16,7 +16,6 @@ import {
     triggerEvent,
     triggerKeyEvent
 } from '@ember/test-helpers';
-import {errorOverride, errorReset} from '../helpers/adapter-error';
 import {expect} from 'chai';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
@@ -877,11 +876,8 @@ describe('Acceptance: Staff', function () {
                 return new Response(404, {'Content-Type': 'application/json'}, {errors: [{message: 'User not found.', type: 'NotFoundError'}]});
             });
 
-            errorOverride();
-
             await visit('/staff/unknown');
 
-            errorReset();
             expect(currentRouteName()).to.equal('error404');
             expect(currentURL()).to.equal('/staff/unknown');
         });
@@ -911,11 +907,8 @@ describe('Acceptance: Staff', function () {
             this.server.create('user', {roles: [adminRole]});
             this.server.create('invite', {role: authorRole});
 
-            errorOverride();
-
             await visit('/staff');
 
-            errorReset();
             expect(currentRouteName()).to.equal('staff.index');
             expect(findAll('.gh-alert').length).to.equal(0);
         });

tests/helpers/adapter-error.js

@@ -1,22 +0,0 @@
-import Ember from 'ember';
-import Test from 'ember-test'; // eslint-disable-line
-
-// This is needed for testing error responses in acceptance tests
-// See http://williamsbdev.com/posts/testing-rsvp-errors-handled-globally/
-
-// ember-cli-shims doesn't export Logger
-const {Logger} = Ember;
-
-let originalException, originalLoggerError;
-
-export function errorOverride() {
-    originalException = Test.adapter.exception;
-    originalLoggerError = Logger.error;
-    Test.adapter.exception = function () {};
-    Logger.error = function () {};
-}
-
-export function errorReset() {
-    Test.adapter.exception = originalException;
-    Logger.error = originalLoggerError;
-}

tests/unit/services/unsplash-test.js

@@ -1,7 +1,6 @@
 import Pretender from 'pretender';
 import wait from 'ember-test-helpers/wait';
 import {describe, it} from 'mocha';
-import {errorOverride, errorReset} from '../../helpers/adapter-error';
 import {expect} from 'chai';
 import {run} from '@ember/runloop';
 import {setupTest} from 'ember-mocha';
@@ -48,9 +47,7 @@ describe('Unit: Service: unsplash', function () {
             });
             await wait();
 
-            errorOverride();
             expect(service.get('error')).to.have.string('Unsplash API rate limit reached');
-            errorReset();
         });
 
         it('handles json errors', async function () {
@@ -67,9 +64,7 @@ describe('Unit: Service: unsplash', function () {
             });
             await wait();
 
-            errorOverride();
             expect(service.get('error')).to.equal('Unsplash API Error');
-            errorReset();
         });
 
         it('handles text errors', async function () {
@@ -84,9 +79,7 @@ describe('Unit: Service: unsplash', function () {
             });
             await wait();
 
-            errorOverride();
             expect(service.get('error')).to.equal('Unsplash text error');
-            errorReset();
         });
     });
 

tests/unit/validators/post-test.js

@@ -40,7 +40,7 @@ describe('Unit: Validator: post', function () {
 
         it('cannot be a random string', async function () {
             let post = Post.create({canonicalUrl: 'asdfghjk'});
-            let passed = await post.validate({property: 'canonicalUrl'}).then(() => true);
+            let passed = await post.validate({property: 'canonicalUrl'}).then(() => true).catch(() => false);
 
             expect(passed, 'passed').to.be.false;
             expect(post.hasValidated).to.include('canonicalUrl');
@@ -52,14 +52,14 @@ describe('Unit: Validator: post', function () {
 
         it('cannot be too long', async function () {
             let post = Post.create({canonicalUrl: `http://example.com/${(new Array(1983).join('x'))}`});
-            let passed = await post.validate({property: 'canonicalUrl'}).then(() => true);
+            let passed = await post.validate({property: 'canonicalUrl'}).then(() => true).catch(() => false);
 
             expect(passed, 'passed').to.be.false;
             expect(post.hasValidated).to.include('canonicalUrl');
 
             let error = post.errors.errorsFor('canonicalUrl').get(0);
             expect(error.attribute).to.equal('canonicalUrl');
-            expect(error.message).to.equal('Please enter a valid URL');
+            expect(error.message).to.equal('Canonical URL is too long, max 2000 chars');
         });
     });
 });

yarn.lock

@@ -5024,16 +5024,16 @@ ember-maybe-in-element@^0.2.0:
   dependencies:
     ember-cli-babel "^7.1.0"
 
-ember-mocha@0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.15.1.tgz#f044cd5a6091f2c97bb3a1e472cb8476b4fde3b6"
-  integrity sha512-OqSeLU84kAfsmkkUUQl0FJlxFhDAPnAyRX6uOFKSHAAffWKTR205txqzbtaxzEJbGJfBODvxqjfdk0tuAIU7BA==
+ember-mocha@0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/ember-mocha/-/ember-mocha-0.16.0.tgz#0a8499f59e626a5af5ca47e3f1d19c2bd5cc7393"
+  integrity sha512-iYWrCOHdPQNwFsD1UNKa6RnA629wgN4zql9730hfiV0Ib4I4VwDueldGwWjXEF+3jGM/R993z6DPvYQKbNfTdg==
   dependencies:
     "@ember/test-helpers" "^1.5.0"
     broccoli-funnel "^2.0.2"
     broccoli-merge-trees "^3.0.2"
     common-tags "^1.8.0"
-    ember-cli-babel "^6.6.0"
+    ember-cli-babel "^7.7.3"
     ember-cli-test-loader "^2.2.0"
     mocha "^2.5.3"