mirror of
https://github.com/TryGhost/Ghost-Admin.git
synced 2023-12-14 02:33:04 +01:00
Replace jquery-deparam with deparam dependency (#973)
This commit is contained in:
parent
3fd2c7ad66
commit
2ea1a354d9
6 changed files with 15 additions and 12 deletions
|
@ -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
|
||||
|
|
|
@ -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']
|
||||
},
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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');
|
||||
});
|
||||
|
|
|
@ -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');
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue