From 2ea1a354d946046c563d62d0fcd39ceca74ed2a9 Mon Sep 17 00:00:00 2001
From: Austin Burdine <acburdine@gmail.com>
Date: Mon, 19 Mar 2018 06:29:01 -0400
Subject: [PATCH] Replace jquery-deparam with deparam dependency (#973)

---
 config/environment.js                   | 6 ++++++
 ember-cli-build.js                      | 3 ---
 package.json                            | 2 +-
 tests/acceptance/authentication-test.js | 4 ++--
 tests/acceptance/signin-test.js         | 4 ++--
 yarn.lock                               | 8 ++++----
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/config/environment.js b/config/environment.js
index 4eb4ee63f..222ecbcc8 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -60,6 +60,12 @@ module.exports = function (environment) {
 
         ENV.APP.rootElement = '#ember-testing';
 
+        // This is needed so that browserify dependencies in tests work correctly
+        // See https://github.com/ef4/ember-browserify/issues/14
+        ENV.browserify = {
+            tests: true
+        };
+
         // Withuot manually setting this, pretender won't track requests
         ENV['ember-cli-mirage'] = {
             trackRequests: true
diff --git a/ember-cli-build.js b/ember-cli-build.js
index b94d14d30..38d6949e4 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -147,9 +147,6 @@ module.exports = function (defaults) {
                 import: ['js/md5.js']
             },
             codemirror: codemirrorAssets(),
-            'jquery-deparam': {
-                import: ['jquery-deparam.js']
-            },
             'mobiledoc-kit': {
                 import: ['dist/amd/mobiledoc-kit.js', 'dist/amd/mobiledoc-kit.map']
             },
diff --git a/package.json b/package.json
index 9a06c59e3..d852d3e77 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "coveralls": "3.0.0",
     "csscomb": "4.2.0",
     "cssnano": "4.0.0-rc.2",
+    "deparam": "1.0.5",
     "ember-ajax": "3.0.0",
     "ember-assign-helper": "0.1.2",
     "ember-browserify": "1.2.1",
@@ -100,7 +101,6 @@
     "glob": "7.1.2",
     "grunt": "1.0.2",
     "grunt-shell": "2.1.0",
-    "jquery-deparam": "0.5.3",
     "liquid-fire": "0.29.2",
     "liquid-tether": "2.0.6",
     "liquid-wormhole": "2.1.1",
diff --git a/tests/acceptance/authentication-test.js b/tests/acceptance/authentication-test.js
index c4217a4d3..eec97ee12 100644
--- a/tests/acceptance/authentication-test.js
+++ b/tests/acceptance/authentication-test.js
@@ -1,5 +1,5 @@
-import $ from 'jquery';
 import OAuth2Authenticator from 'ghost-admin/authenticators/oauth2';
+import deparam from 'npm:deparam';
 import destroyApp from '../helpers/destroy-app';
 import startApp from '../helpers/start-app';
 import windowProxy from 'ghost-admin/utils/window-proxy';
@@ -77,7 +77,7 @@ describe('Acceptance: Authentication', function () {
             expect(refreshRequest, 'token refresh request').to.exist;
             expect(refreshRequest.method, 'method').to.equal('POST');
 
-            let requestBody = $.deparam(refreshRequest.requestBody);
+            let requestBody = deparam(refreshRequest.requestBody);
             expect(requestBody.grant_type, 'grant_type').to.equal('refresh_token');
             expect(requestBody.refresh_token, 'refresh_token').to.equal('MirageRefreshToken');
         });
diff --git a/tests/acceptance/signin-test.js b/tests/acceptance/signin-test.js
index f97a0fb64..981048460 100644
--- a/tests/acceptance/signin-test.js
+++ b/tests/acceptance/signin-test.js
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+import deparam from 'npm:deparam';
 import destroyApp from '../helpers/destroy-app';
 import startApp from '../helpers/start-app';
 import {Response} from 'ember-cli-mirage';
@@ -44,7 +44,7 @@ describe('Acceptance: Signin', function () {
                     username,
                     password,
                     client_id: clientId
-                } = $.deparam(requestBody);
+                } = deparam(requestBody);
 
                 expect(grantType, 'grant type').to.equal('password');
                 expect(username, 'username').to.equal('test@example.com');
diff --git a/yarn.lock b/yarn.lock
index 7705880a2..5a9e7cc20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2923,6 +2923,10 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
+deparam@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/deparam/-/deparam-1.0.5.tgz#74011bbabd26b40f860c3e3cc2cd61bed4eb43f2"
+
 depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
@@ -5927,10 +5931,6 @@ jade@0.26.3:
     commander "0.6.1"
     mkdirp "0.3.0"
 
-jquery-deparam@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/jquery-deparam/-/jquery-deparam-0.5.3.tgz#51f937c448175445499081b87bf32b241b1e2693"
-
 jquery@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"