github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade sinon (v1.17.3 --> v5.0.7). (#19074)

Browse source
This commit is contained in:
Aleh Zasypkin 2018-05-22 12:13:38 +02:00 • committed by GitHub
parent 0263d886e4
commit 0ab9703287
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 443 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -295,7 +295,7 @@
"prettier": "^1.12.1",
"proxyquire": "1.7.11",
"simple-git": "1.37.0",
"sinon": "1.17.3",
"sinon": "^5.0.7",
"source-map": "0.5.6",
"source-map-support": "0.2.10",
"strip-ansi": "^3.0.1",

8
packages/kbn-datemath/test/index.js
View file

@ -355,8 +355,8 @@ describe('dateMath', function() {
dateMath.parse('now', { momentInstance: m1 });
expect(m1Spy.called).to.be(true);
expect(m2Spy.called).to.be(false);
m1Spy.reset();
m2Spy.reset();
m1Spy.resetHistory();
m2Spy.resetHistory();
dateMath.parse('now', { momentInstance: m2 });
expect(m1Spy.called).to.be(false);
expect(m2Spy.called).to.be(true);
@ -371,8 +371,8 @@ describe('dateMath', function() {
dateMath.parse('now', { momentInstance: m });
expect(momentSpy.called).to.be(false);
expect(cloneSpy.called).to.be(true);
momentSpy.reset();
cloneSpy.reset();
momentSpy.resetHistory();
cloneSpy.resetHistory();
dateMath.parse('now');
expect(momentSpy.called).to.be(true);
expect(cloneSpy.called).to.be(false);

2
packages/kbn-ui-framework/package.json
View file

@ -65,7 +65,7 @@
"redux": "3.7.2",
"redux-thunk": "2.2.0",
"sass-loader": "6.0.6",
"sinon": "1.17.2",
"sinon": "^5.0.7",
"style-loader": "0.19.0",
"webpack": "3.6.0",
"webpack-dev-server": "2.9.1",

4
packages/kbn-ui-framework/src/components/tool_bar/tool_bar_search_box.test.js
View file

@ -7,7 +7,7 @@ import {
KuiToolBarSearchBox,
} from './tool_bar_search_box';
const onFilter = sinon.spy();
const onFilter = sinon.stub();
test('renders KuiToolBarSearchBox', () => {
const component = <KuiToolBarSearchBox onFilter={onFilter} {...requiredProps} />;
@ -17,7 +17,7 @@ test('renders KuiToolBarSearchBox', () => {
describe('onFilter', () => {
test('is called on change event, with the value entered', () => {
const searchBox = mount(<KuiToolBarSearchBox onFilter={onFilter} {...requiredProps} />);
onFilter.reset();
onFilter.resetHistory();
const event = { target: { value: 'a' } };
searchBox.find('input').simulate('change', event);
sinon.assert.calledWith(onFilter, 'a');

77
packages/kbn-ui-framework/yarn.lock
View file

@ -27,6 +27,12 @@
version "0.0.0"
uid ""
"@sinonjs/formatio@^2.0.0":
version "2.0.0"
resolved "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
dependencies:
samsam "1.3.0"
"@zeit/check-updates@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@zeit/check-updates/-/check-updates-1.1.0.tgz#d0f65026a36f27cd1fd54c647d8294447c1d2d8b"
@ -2085,7 +2091,7 @@ diff@^2.1.2:
version "2.2.3"
resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99"
diff@^3.3.1:
diff@^3.1.0, diff@^3.3.1:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@ -2773,12 +2779,6 @@ form-data@~2.3.1:
combined-stream "1.0.6"
mime-types "^2.1.12"
formatio@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
dependencies:
samsam "~1.1"
forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@ -4027,6 +4027,10 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
just-extend@^1.1.27:
version "1.1.27"
resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
keymirror@0.1.1, keymirror@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35"
@ -4215,9 +4219,9 @@ loglevel@^1.4.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
lolex@1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
lolex@^2.2.0, lolex@^2.3.2:
version "2.5.0"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.5.0.tgz#69d6a667607738564daf108f63240ae8cbd28fb4"
longest@^1.0.1:
version "1.0.1"
@ -4562,6 +4566,16 @@ neo-async@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
nise@^1.2.0:
version "1.3.3"
resolved "https://registry.yarnpkg.com/nise/-/nise-1.3.3.tgz#c17a850066a8a1dfeb37f921da02441afc4a82ba"
dependencies:
"@sinonjs/formatio" "^2.0.0"
just-extend "^1.1.27"
lolex "^2.3.2"
path-to-regexp "^1.7.0"
text-encoding "^0.6.4"
no-case@^2.2.0:
version "2.3.2"
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
@ -6089,13 +6103,9 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"
samsam@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
samsam@~1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
samsam@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
sass-graph@^2.1.1:
version "2.2.4"
@ -6341,14 +6351,17 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
sinon@1.17.2:
version "1.17.2"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.2.tgz#c1ea67b84a1e7b3350f6c4713efacef8e4ae8b71"
sinon@^5.0.7:
version "5.0.7"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-5.0.7.tgz#3bded6a73613ccc9e512e20246ced69a27c27dab"
dependencies:
formatio "1.1.1"
lolex "1.3.2"
samsam "1.1.2"
util ">=0.10.3 <1"
"@sinonjs/formatio" "^2.0.0"
diff "^3.1.0"
lodash.get "^4.4.2"
lolex "^2.2.0"
nise "^1.2.0"
supports-color "^5.1.0"
type-detect "^4.0.5"
slash@^1.0.0:
version "1.0.0"
@ -6709,6 +6722,12 @@ supports-color@^4.0.0, supports-color@^4.2.1:
dependencies:
has-flag "^2.0.0"
supports-color@^5.1.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
dependencies:
has-flag "^3.0.0"
supports-color@^5.2.0, supports-color@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
@ -6788,6 +6807,10 @@ term-size@^1.2.0:
dependencies:
execa "^0.7.0"
text-encoding@^0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@ -6918,6 +6941,10 @@ twig@^0.8.2:
minimatch "3.0.x"
walk "2.3.x"
type-detect@^4.0.5:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
type-is@~1.6.15:
version "1.6.16"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@ -7109,7 +7136,7 @@ util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
util@0.10.3, util@^0.10.3:
version "0.10.3"
resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
dependencies:

4
src/cli/cluster/cluster_manager.test.js
View file

@ -6,10 +6,10 @@ import ClusterManager from './cluster_manager';
import Worker from './worker';
describe('CLI cluster manager', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(function () {
sandbox.stub(cluster, 'fork', function () {
sandbox.stub(cluster, 'fork').callsFake(() => {
return {
process: {
kill: sinon.stub(),

4
src/cli/cluster/worker.test.js
View file

@ -32,10 +32,10 @@ function setup(opts = {}) {
}
describe('CLI cluster manager', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(function () {
sandbox.stub(cluster, 'fork', () => new MockClusterFork());
sandbox.stub(cluster, 'fork').callsFake(() => new MockClusterFork());
});
afterEach(async function () {

2
src/cli_keystore/add.test.js
View file

@ -9,7 +9,7 @@ import * as prompt from '../server/utils/prompt';
describe('Kibana keystore', () => {
describe('add', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+ 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'

2
src/cli_keystore/create.test.js
View file

@ -8,7 +8,7 @@ import * as prompt from '../server/utils/prompt';
describe('Kibana keystore', () => {
describe('create', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+ 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'

2
src/cli_keystore/list.test.js
View file

@ -7,7 +7,7 @@ import Logger from '../cli_plugin/lib/logger';
describe('Kibana keystore', () => {
describe('list', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+ 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'

2
src/cli_keystore/remove.test.js
View file

@ -6,7 +6,7 @@ import { remove } from './remove';
describe('Kibana keystore', () => {
describe('remove', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const keystoreData = '1:IxR0geiUTMJp8ueHDkqeUJ0I9eEw4NJPXIJi22UDyfGfJSy4mH'
+ 'BBuGPkkAix/x/YFfIxo4tiKGdJ2oVTtU8LgKDkVoGdL+z7ylY4n3myatt6osqhI4lzJ9M'

15
src/cli_plugin/install/cleanup.test.js
View file

@ -34,7 +34,7 @@ describe('kibana cli', function () {
it('should resolve if the working path does not exist', function () {
sinon.stub(rimraf, 'sync');
sinon.stub(fs, 'statSync', function () {
sinon.stub(fs, 'statSync').callsFake(() => {
const error = new Error('ENOENT');
error.code = 'ENOENT';
throw error;
@ -49,10 +49,7 @@ describe('kibana cli', function () {
it('should rethrow any exception except ENOENT from fs.statSync', function () {
sinon.stub(rimraf, 'sync');
sinon.stub(fs, 'statSync', function () {
const error = new Error('An Unhandled Error');
throw error;
});
sinon.stub(fs, 'statSync').throws(new Error('An Unhandled Error'));
errorStub = sinon.stub();
return cleanPrevious(settings, logger)
@ -75,9 +72,7 @@ describe('kibana cli', function () {
it('should rethrow any exception from rimraf.sync', function () {
sinon.stub(fs, 'statSync');
sinon.stub(rimraf, 'sync', function () {
throw new Error('I am an error thrown by rimraf');
});
sinon.stub(rimraf, 'sync').throws(new Error('I am an error thrown by rimraf'));
errorStub = sinon.stub();
return cleanPrevious(settings, logger)
@ -114,9 +109,7 @@ describe('kibana cli', function () {
});
it('should swallow any errors thrown by rimraf.sync', function () {
sinon.stub(rimraf, 'sync', function () {
throw new Error('Something bad happened.');
});
sinon.stub(rimraf, 'sync').throws(new Error('Something bad happened.'));
expect(() => cleanArtifacts(settings)).not.toThrow();
});

6
src/cli_plugin/install/rename.test.js
View file

@ -15,7 +15,7 @@ describe('plugin folder rename', function () {
});
it('should rethrow any exceptions', function () {
renameStub = sinon.stub(fs, 'rename', function (from, to, cb) {
renameStub = sinon.stub(fs, 'rename').callsFake((from, to, cb) => {
cb({
code: 'error'
});
@ -29,7 +29,7 @@ describe('plugin folder rename', function () {
});
it('should resolve if there are no errors', function () {
renameStub = sinon.stub(fs, 'rename', function (from, to, cb) {
renameStub = sinon.stub(fs, 'rename').callsFake((from, to, cb) => {
cb();
});
@ -55,7 +55,7 @@ describe('plugin folder rename', function () {
});
it('should retry on Windows EPERM errors for up to 3 seconds', function () {
renameStub = sinon.stub(fs, 'rename', function (from, to, cb) {
renameStub = sinon.stub(fs, 'rename').callsFake((from, to, cb) => {
cb({
code: 'EPERM'
});

2
src/core_plugins/console/public/src/__tests__/app.js
View file

@ -6,7 +6,7 @@ import mappings from '../mappings';
import init from '../app';
describe('app initialization', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let inputMock, outputMock;
let ajaxDoneStub;

4
src/core_plugins/console/server/__tests__/proxy_config.js
View file

@ -18,9 +18,7 @@ const parsedLocalEs = parseUrl('https://localhost:5601/search');
describe('ProxyConfig', function () {
beforeEach(function () {
sinon.stub(fs, 'readFileSync', function (path) {
return { path };
});
sinon.stub(fs, 'readFileSync').callsFake((path) => ({ path }));
});
afterEach(function () {

2
src/core_plugins/console/server/__tests__/proxy_config_collection.js
View file

@ -9,7 +9,7 @@ import { ProxyConfigCollection } from '../proxy_config_collection';
describe('ProxyConfigCollection', function () {
beforeEach(function () {
sinon.stub(fs, 'readFileSync', () => new Buffer(0));
sinon.stub(fs, 'readFileSync').callsFake(() => new Buffer(0));
});
afterEach(function () {

6
src/core_plugins/console/server/__tests__/proxy_route/body.js
View file

@ -8,14 +8,13 @@ import { createProxyRoute } from '../../';
import { createWreckResponseStub } from './stubs';
describe('Console Proxy Route', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const teardowns = [];
let request;
beforeEach(() => {
teardowns.push(() => sandbox.restore());
request = async (method, path, response) => {
sandbox.stub(Wreck, 'request', createWreckResponseStub(response));
sandbox.stub(Wreck, 'request').callsFake(createWreckResponseStub(response));
const server = new Server();
@ -37,6 +36,7 @@ describe('Console Proxy Route', () => {
});
afterEach(async () => {
sandbox.restore();
await Promise.all(teardowns.splice(0).map(fn => fn()));
});

7
src/core_plugins/console/server/__tests__/proxy_route/headers.js
View file

@ -10,14 +10,12 @@ import { createProxyRoute } from '../../';
import { createWreckResponseStub } from './stubs';
describe('Console Proxy Route', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const teardowns = [];
let setup;
beforeEach(() => {
teardowns.push(() => sandbox.restore());
sandbox.stub(Wreck, 'request', createWreckResponseStub());
sandbox.stub(Wreck, 'request').callsFake(createWreckResponseStub());
setup = () => {
const server = new Server();
@ -34,6 +32,7 @@ describe('Console Proxy Route', () => {
});
afterEach(async () => {
sandbox.restore();
await Promise.all(teardowns.splice(0).map(fn => fn()));
});

7
src/core_plugins/console/server/__tests__/proxy_route/params.js
View file

@ -10,14 +10,12 @@ import { createProxyRoute } from '../../';
import { createWreckResponseStub } from './stubs';
describe('Console Proxy Route', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const teardowns = [];
let setup;
beforeEach(() => {
teardowns.push(() => sandbox.restore());
sandbox.stub(Wreck, 'request', createWreckResponseStub());
sandbox.stub(Wreck, 'request').callsFake(createWreckResponseStub());
setup = () => {
const server = new Server();
@ -28,6 +26,7 @@ describe('Console Proxy Route', () => {
});
afterEach(async () => {
sandbox.restore();
await Promise.all(teardowns.splice(0).map(fn => fn()));
});

7
src/core_plugins/console/server/__tests__/proxy_route/query_string.js
View file

@ -8,14 +8,12 @@ import { createProxyRoute } from '../../';
import { createWreckResponseStub } from './stubs';
describe('Console Proxy Route', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const teardowns = [];
let request;
beforeEach(() => {
teardowns.push(() => sandbox.restore());
sandbox.stub(Wreck, 'request', createWreckResponseStub());
sandbox.stub(Wreck, 'request').callsFake(createWreckResponseStub());
request = async (method, path) => {
const server = new Server();
@ -38,6 +36,7 @@ describe('Console Proxy Route', () => {
});
afterEach(async () => {
sandbox.restore();
await Promise.all(teardowns.splice(0).map(fn => fn()));
});

4
src/core_plugins/elasticsearch/lib/__tests__/create_clusters.js
View file

@ -52,10 +52,10 @@ describe('plugins/elasticsearch', function () {
});
describe('server stop', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(() => {
sandbox.stub(ClusterNS, 'Cluster', function () {
sandbox.stub(ClusterNS, 'Cluster').callsFake(function () {
this.stub = true;
this.close = sinon.stub();
});

25
src/core_plugins/elasticsearch/lib/__tests__/health_check.js
View file

@ -15,19 +15,18 @@ const esUrl = esTestConfig.getUrl();
describe('plugins/elasticsearch', () => {
describe('lib/health_check', function () {
this.timeout(3000);
let health;
let plugin;
let cluster;
let server;
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
function getTimerCount() {
return Object.keys(sandbox.clock.timers || {}).length;
}
beforeEach(() => {
sandbox.useFakeTimers();
const COMPATIBLE_VERSION_NUMBER = '5.0.0';
// Stub the Kibana version instead of drawing from package.json.
@ -90,8 +89,6 @@ describe('plugins/elasticsearch', () => {
afterEach(() => sandbox.restore());
it('should stop when cluster is shutdown', () => {
sandbox.useFakeTimers();
// ensure that health.start() is responsible for the timer we are observing
expect(getTimerCount()).to.be(0);
health.start();
@ -127,13 +124,19 @@ describe('plugins/elasticsearch', () => {
});
});
it('should set the cluster red if the ping fails, then to green', function () {
it('should set the cluster red if the ping fails, then to green', async () => {
const ping = cluster.callWithInternalUser.withArgs('ping');
ping.onCall(0).returns(Promise.reject(new NoConnections()));
ping.onCall(1).returns(Promise.resolve());
return health.run()
.then(function () {
const healthRunPromise = health.run();
// Exhaust micro-task queue, to make sure that next health check is rescheduled.
await Promise.resolve();
sandbox.clock.runAll();
return healthRunPromise
.then(() => {
sinon.assert.calledOnce(plugin.status.yellow);
sinon.assert.calledWithExactly(plugin.status.yellow, 'Waiting for Elasticsearch');
@ -157,7 +160,11 @@ describe('plugins/elasticsearch', () => {
setImmediate(handler);
});
return health.waitUntilReady().then(function () {
const waitUntilReadyPromise = health.waitUntilReady();
sandbox.clock.runAll();
return waitUntilReadyPromise.then(function () {
sinon.assert.calledOnce(plugin.status.once);
});
});

2
src/core_plugins/kibana/public/dashboard/__tests__/dashboard_context.js
View file

@ -67,7 +67,7 @@ describe('Dashboard Context', () => {
});
afterEach(() => {
getAppState.reset();
getAppState.resetHistory();
});
it('should add a valid filter to must', () => {

4
src/core_plugins/kibana/public/dev_tools/hacks/__tests__/hide_empty_tools.js
View file

@ -21,9 +21,7 @@ describe('hide dev tools', function () {
beforeEach(function () {
navlinks = {};
sinon.stub(chrome, 'getNavLinkById', function () {
return navlinks;
});
sinon.stub(chrome, 'getNavLinkById').returns(navlinks);
});
it('should hide the app if there are no dev tools', function () {

1
src/core_plugins/kibana/server/lib/__tests__/manage_uuid.js
View file

@ -20,7 +20,6 @@ describe('core_plugins/kibana/server/lib', function () {
// clear uuid stuff from previous test runs
beforeEach(function () {
kbnServer.server.log = sinon.stub();
kbnServer.server.log.reset();
config = kbnServer.server.config();
});

4
src/core_plugins/kibana/server/lib/export/__tests__/collect_dashboards.js
View file

@ -6,7 +6,7 @@ import { expect } from 'chai';
describe('collectDashboards(req, ids)', () => {
let collectPanelsStub;
const savedObjectsClient = { bulkGet: sinon.mock() };
const savedObjectsClient = { bulkGet: sinon.stub() };
const ids = ['dashboard-01', 'dashboard-02'];
@ -32,7 +32,7 @@ describe('collectDashboards(req, ids)', () => {
afterEach(() => {
collectPanelsStub.restore();
savedObjectsClient.bulkGet.reset();
savedObjectsClient.bulkGet.resetHistory();
});
it('should request all dashboards', async () => {

4
src/core_plugins/kibana/server/lib/export/__tests__/collect_index_patterns.js
View file

@ -32,7 +32,7 @@ describe('collectIndexPatterns(req, panels)', () => {
}
];
const savedObjectsClient = { bulkGet: sinon.mock() };
const savedObjectsClient = { bulkGet: sinon.stub() };
beforeEach(() => {
savedObjectsClient.bulkGet.returns(Promise.resolve({
@ -43,7 +43,7 @@ describe('collectIndexPatterns(req, panels)', () => {
});
afterEach(() => {
savedObjectsClient.bulkGet.reset();
savedObjectsClient.bulkGet.resetHistory();
});
it('should request all index patterns', async () => {

4
src/core_plugins/kibana/server/lib/export/__tests__/collect_panels.js
View file

@ -9,7 +9,7 @@ describe('collectPanels(req, dashboard)', () => {
let collectIndexPatternsStub;
let dashboard;
const savedObjectsClient = { bulkGet: sinon.mock() };
const savedObjectsClient = { bulkGet: sinon.stub() };
beforeEach(() => {
dashboard = {
@ -36,7 +36,7 @@ describe('collectPanels(req, dashboard)', () => {
afterEach(() => {
collectSearchSourcesStub.restore();
collectIndexPatternsStub.restore();
savedObjectsClient.bulkGet.reset();
savedObjectsClient.bulkGet.resetHistory();
});
it('should request each panel in the panelJSON', async () => {

4
src/core_plugins/kibana/server/lib/export/__tests__/collect_search_sources.js
View file

@ -3,7 +3,7 @@ import * as deps from '../collect_index_patterns';
import { collectSearchSources } from '../collect_search_sources';
import { expect } from 'chai';
describe('collectSearchSources(req, panels)', () => {
const savedObjectsClient = { bulkGet: sinon.mock() };
const savedObjectsClient = { bulkGet: sinon.stub() };
let panels;
let collectIndexPatternsStub;
@ -26,7 +26,7 @@ describe('collectSearchSources(req, panels)', () => {
afterEach(() => {
collectIndexPatternsStub.restore();
savedObjectsClient.bulkGet.reset();
savedObjectsClient.bulkGet.resetHistory();
});
it('should request all search sources', async () => {

12
src/core_plugins/metrics/public/services/__tests__/executor_provider.js
View file

@ -17,8 +17,8 @@ describe('$executor service', () => {
$timeout.cancel = (id) => clearTimeout(id);
timefilter = new EventEmitter();
onSpy = sinon.spy((...args) => timefilter.addListener(...args));
offSpy = sinon.spy((...args) => timefilter.removeListener(...args));
onSpy = sinon.stub().callsFake((...args) => timefilter.addListener(...args));
offSpy = sinon.stub().callsFake((...args) => timefilter.removeListener(...args));
timefilter.on = onSpy;
timefilter.off = offSpy;
@ -59,13 +59,17 @@ describe('$executor service', () => {
it('should execute function if ingorePause is passed (interval set to 1000ms)', (done) => {
timefilter.refreshInterval.value = 1000;
executor.register({ execute: () => done() });
executor.register({
execute: () => Promise.resolve().then(done)
});
executor.start({ ignorePaused: true });
});
it('should execute function if timefilter is not paused and interval set to 1000ms', (done) => {
timefilter.refreshInterval.value = 1000;
executor.register({ execute: () => done() });
executor.register({
execute: () => Promise.resolve().then(done)
});
executor.start();
});

2
src/core_plugins/region_map/public/__tests__/region_map_visualization.js
View file

@ -125,7 +125,7 @@ describe('RegionMapsVisualizationTests', function () {
};
const serviceSettings = $injector.get('serviceSettings');
sinon.stub(serviceSettings, '_getManifest', function (url) {
sinon.stub(serviceSettings, '_getManifest').callsFake((url) => {
let contents = null;
if (url.startsWith(tmsManifestUrl)) {
contents = tmsManifest;

2
src/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
View file

@ -77,7 +77,7 @@ describe('CoordinateMapsVisualizationTest', function () {
const serviceSettings = $injector.get('serviceSettings');
sinon.stub(serviceSettings, '_getManifest', function (url) {
sinon.stub(serviceSettings, '_getManifest').callsFake((url) => {
let contents = null;
if (url.startsWith(tmsManifestUrl)) {
contents = tmsManifest;

4
src/dev/build/lib/__tests__/build.js
View file

@ -92,7 +92,7 @@ describe('dev/build/lib/build', () => {
});
describe('#getPlatformArchivePath()', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const config = {
resolveFromRepo: sandbox.stub(),
@ -110,7 +110,7 @@ describe('dev/build/lib/build', () => {
};
beforeEach(() => {
sandbox.reset();
sandbox.resetHistory();
});
it('uses config.resolveFromRepo(), config.getBuildVersion, and platform.getBuildName() to create path', () => {

2
src/dev/build/lib/__tests__/exec.js
View file

@ -7,7 +7,7 @@ import { createToolingLog } from '@kbn/dev-utils';
import { exec } from '../exec';
describe('dev/build/lib/exec', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => sandbox.reset());
const log = createToolingLog('verbose');

2
src/dev/build/lib/__tests__/runner.js
View file

@ -6,7 +6,7 @@ import { createRunner } from '../runner';
import { isErrorLogged, markErrorLogged } from '../errors';
describe('dev/build/lib/runner', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const config = {};

4
src/dev/build/tasks/nodejs/__tests__/download.js
View file

@ -19,7 +19,7 @@ after(async () => {
});
describe('src/dev/build/tasks/nodejs/download', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => sandbox.reset());
const log = createToolingLog('verbose');
@ -177,7 +177,7 @@ describe('src/dev/build/tasks/nodejs/download', () => {
describe('sha256 option not supplied', () => {
before(() => {
sinon.spy(Wreck, 'request');
sinon.stub(Wreck, 'request');
});
after(() => {
Wreck.request.restore();

6
src/dev/build/tasks/nodejs/__tests__/download_node_builds_task.js
View file

@ -7,7 +7,7 @@ import * as DownloadNS from '../download';
import { DownloadNodeBuildsTask } from '../download_node_builds_task';
describe('src/dev/build/tasks/nodejs/download_node_builds_task', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => {
sandbox.restore();
});
@ -24,7 +24,7 @@ describe('src/dev/build/tasks/nodejs/download_node_builds_task', () => {
getNodeVersion: () => 'nodeVersion',
};
sandbox.stub(NodeDownloadInfoNS, 'getNodeDownloadInfo', function (config, platform) {
sandbox.stub(NodeDownloadInfoNS, 'getNodeDownloadInfo').callsFake((config, platform) => {
return {
url: `${platform.getName()}:url`,
downloadPath: `${platform.getName()}:downloadPath`,
@ -37,7 +37,7 @@ describe('src/dev/build/tasks/nodejs/download_node_builds_task', () => {
'bar:downloadName': 'bar:sha256',
});
sandbox.stub(DownloadNS, 'download', function ({ url }) {
sandbox.stub(DownloadNS, 'download').callsFake(({ url }) => {
if (url === failOnUrl) {
throw new Error('Download failed for reasons');
}

2
src/dev/build/tasks/nodejs/__tests__/extract_node_builds_task.js
View file

@ -6,7 +6,7 @@ import * as FsNS from '../../../lib/fs';
import { ExtractNodeBuildsTask } from '../extract_node_builds_task';
describe('src/dev/build/tasks/node_extract_node_builds_task', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => {
sandbox.restore();
});

6
src/dev/build/tasks/nodejs/__tests__/verify_existing_node_builds_task.js
View file

@ -7,7 +7,7 @@ import * as FsNS from '../../../lib/fs';
import { VerifyExistingNodeBuildsTask } from '../verify_existing_node_builds_task';
describe('src/dev/build/tasks/nodejs/verify_existing_node_builds_task', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => {
sandbox.restore();
});
@ -24,7 +24,7 @@ describe('src/dev/build/tasks/nodejs/verify_existing_node_builds_task', () => {
getNodeVersion: () => 'nodeVersion',
};
sandbox.stub(NodeDownloadInfoNS, 'getNodeDownloadInfo', function (config, platform) {
sandbox.stub(NodeDownloadInfoNS, 'getNodeDownloadInfo').callsFake((config, platform) => {
return {
url: `${platform.getName()}:url`,
downloadPath: `${platform.getName()}:downloadPath`,
@ -37,7 +37,7 @@ describe('src/dev/build/tasks/nodejs/verify_existing_node_builds_task', () => {
'bar:downloadName': 'bar:sha256',
});
sandbox.stub(FsNS, 'getFileHash', function (path) {
sandbox.stub(FsNS, 'getFileHash').callsFake((path) => {
switch (path) {
case 'foo:downloadPath':
return 'foo:sha256';

4
src/optimize/bundles_route/__tests__/bundles_route.js
View file

@ -19,7 +19,7 @@ function replaceAll(source, replace, replaceWith) {
}
describe('optimizer/bundle route', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
function createServer(options = {}) {
const {
@ -262,7 +262,7 @@ describe('optimizer/bundle route', () => {
});
sinon.assert.calledOnce(createHash);
createHash.reset();
createHash.resetHistory();
expect(resp1.statusCode).to.be(200);
const resp2 = await server.inject({

2
src/plugin_discovery/plugin_config/__tests__/extend_config_service.js
View file

@ -8,7 +8,7 @@ import * as SchemaNS from '../schema';
import * as SettingsNS from '../settings';
describe('plugin discovery/extend config service', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => sandbox.restore());
const pluginSpec = new PluginPack({

2
src/plugin_discovery/plugin_spec/__tests__/plugin_spec.js
View file

@ -433,7 +433,7 @@ describe('plugin discovery/plugin spec', () => {
get: sinon.stub()
};
afterEach(() => config.get.reset());
afterEach(() => config.get.resetHistory());
describe('key = "foo"', () => {
it('passes key as own array item', () => {

4
src/server/config/complete.test.js
View file

@ -7,7 +7,7 @@ import { transformDeprecations } from './transform_deprecations';
/* eslint-enable import/no-duplicates */
describe('server/config completeMixin()', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => sandbox.restore());
const setup = (options = {}) => {
@ -183,7 +183,7 @@ describe('server/config completeMixin()', function () {
});
it('should use transformed settings when considering what is used', function () {
sandbox.stub(transformDeprecationsNS, 'transformDeprecations', (settings) => {
sandbox.stub(transformDeprecationsNS, 'transformDeprecations').callsFake((settings) => {
settings.bar = settings.foo;
delete settings.foo;
return settings;

2
src/server/http/short_url_lookup.test.js
View file

@ -7,7 +7,7 @@ describe('shortUrlLookupProvider', () => {
const TYPE = 'url';
const URL = 'http://elastic.co';
const server = { log: sinon.stub() };
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let savedObjectsClient;
let req;

8
src/server/index_patterns/service/lib/es_api.test.js
View file

@ -9,7 +9,7 @@ import { callIndexAliasApi, callFieldCapsApi } from './es_api';
describe('server/index_patterns/service/lib/es_api', () => {
describe('#callIndexAliasApi()', () => {
let sandbox;
beforeEach(() => sandbox = sinon.sandbox.create());
beforeEach(() => sandbox = sinon.createSandbox());
afterEach(() => sandbox.restore());
it('calls indices.getAlias() via callCluster', async () => {
@ -50,7 +50,7 @@ describe('server/index_patterns/service/lib/es_api', () => {
const esError = new Error('esError');
const convertedError = new Error('convertedError');
sandbox.stub(convertEsErrorNS, 'convertEsError', () => { throw convertedError; });
sandbox.stub(convertEsErrorNS, 'convertEsError').throws(convertedError);
const callCluster = sinon.spy(async () => { throw esError; });
try {
await callIndexAliasApi(callCluster, indices);
@ -66,7 +66,7 @@ describe('server/index_patterns/service/lib/es_api', () => {
describe('#callFieldCapsApi()', () => {
let sandbox;
beforeEach(() => sandbox = sinon.sandbox.create());
beforeEach(() => sandbox = sinon.createSandbox());
afterEach(() => sandbox.restore());
it('calls fieldCaps() via callCluster', async () => {
@ -108,7 +108,7 @@ describe('server/index_patterns/service/lib/es_api', () => {
const esError = new Error('esError');
const convertedError = new Error('convertedError');
sandbox.stub(convertEsErrorNS, 'convertEsError', () => { throw convertedError; });
sandbox.stub(convertEsErrorNS, 'convertEsError').throws(convertedError);
const callCluster = sinon.spy(async () => { throw esError; });
try {
await callFieldCapsApi(callCluster, indices);

8
src/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js
View file

@ -15,7 +15,7 @@ import * as mergeOverridesNS from './overrides';
describe('index_patterns/field_capabilities/field_capabilities', () => {
let sandbox;
beforeEach(() => sandbox = sinon.sandbox.create());
beforeEach(() => sandbox = sinon.createSandbox());
afterEach(() => sandbox.restore());
const footballs = [
@ -35,9 +35,9 @@ describe('index_patterns/field_capabilities/field_capabilities', () => {
mergeOverrides = identity
} = options;
sandbox.stub(callFieldCapsApiNS, 'callFieldCapsApi', async () => esResponse);
sandbox.stub(readFieldCapsResponseNS, 'readFieldCapsResponse', () => fieldsFromFieldCaps);
sandbox.stub(mergeOverridesNS, 'mergeOverrides', mergeOverrides);
sandbox.stub(callFieldCapsApiNS, 'callFieldCapsApi').callsFake(async () => esResponse);
sandbox.stub(readFieldCapsResponseNS, 'readFieldCapsResponse').returns(fieldsFromFieldCaps);
sandbox.stub(mergeOverridesNS, 'mergeOverrides').callsFake(mergeOverrides);
};
describe('calls `callFieldCapsApi()`', () => {

2
src/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js
View file

@ -11,7 +11,7 @@ import esResponse from './__fixtures__/es_field_caps_response.json';
describe('index_patterns/field_capabilities/field_caps_response', () => {
let sandbox;
beforeEach(() => sandbox = sinon.sandbox.create());
beforeEach(() => sandbox = sinon.createSandbox());
afterEach(() => sandbox.restore());
describe('readFieldCapsResponse()', () => {

2
src/server/index_patterns/service/lib/resolve_time_pattern.test.js
View file

@ -13,7 +13,7 @@ const TIME_PATTERN = '[logs-]dddd-YYYY.w';
describe('server/index_patterns/service/lib/resolve_time_pattern', () => {
let sandbox;
beforeEach(() => sandbox = sinon.sandbox.create());
beforeEach(() => sandbox = sinon.createSandbox());
afterEach(() => sandbox.restore());
describe('resolveTimePattern()', () => {

2
src/server/keystore/keystore.test.js
View file

@ -5,7 +5,7 @@ import { readFileSync } from 'fs';
import { Keystore } from './keystore';
describe('Keystore', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const protoctedKeystoreData = '1:4BnWfydL8NwFIQJg+VQKe0jlIs7uXtty6+++yaWPbSB'
+ 'KIX3d9nPfQ20K1C6Xh26E/gMJAQ9jh7BxK0+W3lt/iDJBJn44wqX3pQ0189iGkNBL0ibDCc'

2
src/server/saved_objects/client/lib/search_dsl/search_dsl.test.js
View file

@ -4,7 +4,7 @@ import * as queryParamsNS from './query_params';
import * as sortParamsNS from './sorting_params';
describe('getSearchDsl', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => sandbox.restore());
describe('validation', () => {

6
src/server/saved_objects/client/saved_objects_client.test.js
View file

@ -6,7 +6,7 @@ import { getSearchDsl } from './lib';
import elasticsearch from 'elasticsearch';
describe('SavedObjectsClient', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let callAdminCluster;
let onBeforeWrite;
@ -207,8 +207,8 @@ describe('SavedObjectsClient', () => {
sinon.assert.calledOnce(onBeforeWrite);
callAdminCluster.reset();
onBeforeWrite.reset();
callAdminCluster.resetHistory();
onBeforeWrite.resetHistory();
await savedObjectsClient.bulkCreate([{ type: 'foo', id: 'bar', attributes: {} }], { overwrite: true });
sinon.assert.calledOnce(callAdminCluster);

2
src/server/saved_objects/routes/bulk_get.test.js
View file

@ -22,7 +22,7 @@ describe('POST /api/saved_objects/_bulk_get', () => {
});
afterEach(() => {
savedObjectsClient.bulkGet.reset();
savedObjectsClient.bulkGet.resetHistory();
});
it('formats successful response', async () => {

2
src/server/saved_objects/routes/create.test.js
View file

@ -22,7 +22,7 @@ describe('POST /api/saved_objects/{type}', () => {
});
afterEach(() => {
savedObjectsClient.create.reset();
savedObjectsClient.create.resetHistory();
});
it('formats successful response', async () => {

2
src/server/saved_objects/routes/delete.test.js
View file

@ -22,7 +22,7 @@ describe('DELETE /api/saved_objects/{type}/{id}', () => {
});
afterEach(() => {
savedObjectsClient.delete.reset();
savedObjectsClient.delete.resetHistory();
});
it('formats successful response', async () => {

2
src/server/saved_objects/routes/find.test.js
View file

@ -22,7 +22,7 @@ describe('GET /api/saved_objects/_find', () => {
});
afterEach(() => {
savedObjectsClient.find.reset();
savedObjectsClient.find.resetHistory();
});
it('formats successful response', async () => {

2
src/server/saved_objects/routes/get.test.js
View file

@ -22,7 +22,7 @@ describe('GET /api/saved_objects/{type}/{id}', () => {
});
afterEach(() => {
savedObjectsClient.get.reset();
savedObjectsClient.get.resetHistory();
});
it('formats successful response', async () => {

2
src/server/saved_objects/routes/update.test.js
View file

@ -22,7 +22,7 @@ describe('PUT /api/saved_objects/{type}/{id?}', () => {
});
afterEach(() => {
savedObjectsClient.update.reset();
savedObjectsClient.update.resetHistory();
});
it('formats successful response', async () => {

4
src/server/status/metrics_collector/metrics_collector.test.js
View file

@ -37,8 +37,8 @@ describe('Metrics Collector', () => {
let sandbox;
let clock;
beforeAll(() => {
sandbox = sinon.sandbox.create();
clock = sinon.useFakeTimers(1524174654366);
sandbox = sinon.createSandbox();
clock = sandbox.useFakeTimers(1524174654366);
});
afterAll(() => {

2
src/server/utils/prompt.test.js
View file

@ -4,7 +4,7 @@ import { PassThrough } from 'stream';
import { confirm, question } from './prompt';
describe('prompt', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let input;
let output;

4
src/ui/field_formats/__tests__/field_formats_mixin.js
View file

@ -6,7 +6,7 @@ import * as FieldFormatsServiceNS from '../field_formats_service';
import { createServer } from '../../../test_utils/kbn_server';
describe('server.registerFieldFormat(createFormat)', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let server;
beforeEach(async () => {
@ -34,7 +34,7 @@ describe('server.registerFieldFormat(createFormat)', () => {
it('passes the returned class to the FieldFormatsService', async () => {
const { FieldFormatsService: ActualFFS } = FieldFormatsServiceNS;
sinon.stub(FieldFormatsServiceNS, 'FieldFormatsService', function (...args) {
sandbox.stub(FieldFormatsServiceNS, 'FieldFormatsService').callsFake((...args) => {
return new ActualFFS(...args);
});

2
src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
View file

@ -14,7 +14,7 @@ let indexPattern;
let buildHierarchicalData;
describe('buildHierarchicalData', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {

4
src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
View file

@ -41,8 +41,8 @@ describe('Geohash Agg', () => {
};
before(function () {
sinon.stub(AggConfigModule, 'AggConfig', AggConfigMock);
sinon.stub(BucketAggTypeModule, 'BucketAggType', BucketAggTypeMock);
sinon.stub(AggConfigModule, 'AggConfig').callsFake(AggConfigMock);
sinon.stub(BucketAggTypeModule, 'BucketAggType').callsFake(BucketAggTypeMock);
});
after(function () {

2
src/ui/public/chrome/api/__tests__/xsrf.js
View file

@ -9,7 +9,7 @@ import { version } from '../../../../../../package.json';
const xsrfHeader = 'kbn-version';
describe('chrome xsrf apis', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(function () {
sandbox.restore();

12
src/ui/public/courier/__tests__/saved_object.js
View file

@ -169,7 +169,7 @@ describe('Saved Object', function () {
const mockDocResponse = getMockedDocResponse('myId');
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create', function () {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({ type: 'dashboard', id: 'newUniqueId' });
});
@ -185,7 +185,7 @@ describe('Saved Object', function () {
const mockDocResponse = getMockedDocResponse(originalId);
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: originalId }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create', function () {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.reject('simulated error');
});
savedObject.copyOnSave = true;
@ -203,7 +203,7 @@ describe('Saved Object', function () {
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create', function () {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.id).to.be(id);
return BluebirdPromise.resolve(id);
});
@ -218,7 +218,7 @@ describe('Saved Object', function () {
it('returns id from server on success', function () {
return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
const mockDocResponse = getMockedDocResponse('myId');
sinon.stub(savedObjectsClientStub, 'create', function () {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({ type: 'dashboard', id: 'myId', _version: 2 });
});
@ -235,7 +235,7 @@ describe('Saved Object', function () {
stubESResponse(getMockedDocResponse(id));
return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create', () => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.isSaving).to.be(true);
return BluebirdPromise.resolve({
type: 'dashboard', id, version: 2
@ -251,7 +251,7 @@ describe('Saved Object', function () {
it('on failure', function () {
stubESResponse(getMockedDocResponse('id'));
return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create', () => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.isSaving).to.be(true);
return BluebirdPromise.reject();
});

2
src/ui/public/courier/fetch/request/__tests__/segmented.js
View file

@ -18,7 +18,7 @@ describe('SegmentedRequestProvider', () => {
SegmentedReq = Private(SegmentedRequestProvider);
const SearchRequest = Private(SearchRequestProvider);
abstractReqStart = sinon.stub(SearchRequest.prototype, 'start', () => {
abstractReqStart = sinon.stub(SearchRequest.prototype, 'start').callsFake(() => {
const promise = Promise.resolve();
sinon.spy(promise, 'then');
return promise;

14
src/ui/public/debounce/__tests__/debounce.js
View file

@ -35,7 +35,7 @@ describe('debounce service', function () {
});
describe('delayed execution', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(() => sandbox.useFakeTimers());
afterEach(() => sandbox.restore());
@ -49,7 +49,7 @@ describe('debounce service', function () {
$timeout.flush();
sinon.assert.calledOnce(spy);
spy.reset();
spy.resetHistory();
bouncerFromProvider();
sinon.assert.notCalled(spy);
@ -66,7 +66,7 @@ describe('debounce service', function () {
$timeout.flush();
sinon.assert.calledTwice(spy);
spy.reset();
spy.resetHistory();
bouncerFromProvider();
sinon.assert.calledOnce(spy);
@ -83,7 +83,7 @@ describe('debounce service', function () {
$timeout.flush();
sinon.assert.calledOnce(spy);
spy.reset();
spy.resetHistory();
bouncerFromProvider();
sinon.assert.calledOnce(spy);
@ -105,8 +105,8 @@ describe('debounce service', function () {
sinon.assert.calledOnce(spy);
sinon.assert.calledOnce(cancelSpy);
spy.reset();
cancelSpy.reset();
spy.resetHistory();
cancelSpy.resetHistory();
bouncerFromProvider();
sandbox.clock.tick(1);
@ -131,7 +131,7 @@ describe('debounce service', function () {
// throws if pending timeouts
$timeout.verifyNoPendingTasks();
cancelSpy.reset();
cancelSpy.resetHistory();
bouncerFromProvider();
bouncerFromProvider.cancel();

4
src/ui/public/directives/__tests__/fixed_scroll.js
View file

@ -6,7 +6,7 @@ import $ from 'jquery';
import sinon from 'sinon';
describe('FixedScroll directive', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let compile;
let flushPendingTasks;
@ -156,7 +156,7 @@ describe('FixedScroll directive', function () {
$from.scroll();
expect(spy.callCount).to.be(2);
spy.reset();
spy.resetHistory();
$to.scroll();
expect(spy.callCount).to.be(0);
});

2
src/ui/public/directives/__tests__/timepicker.js
View file

@ -70,7 +70,7 @@ const init = function () {
describe('timepicker directive', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(function () {
// Stub out the clock so 'now' doesn't move

2
src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
View file

@ -39,7 +39,7 @@ describe('filterBarClickHandler', function () {
};
}));
afterEach(function () {
beforeEach(function () {
toastNotifications.list.splice(0);
});

8
src/ui/public/filter_manager/__tests__/filter_manager.js
View file

@ -41,14 +41,12 @@ describe('Filter Manager', function () {
// mock required queryFilter methods, used in the manager
queryFilter = Private(FilterBarQueryFilterProvider);
sinon.stub(queryFilter, 'getAppFilters', function () {
return appState.filters;
});
sinon.stub(queryFilter, 'addFilters', function (filters) {
sinon.stub(queryFilter, 'getAppFilters').callsFake(() => appState.filters);
sinon.stub(queryFilter, 'addFilters').callsFake((filters) => {
if (!Array.isArray(filters)) filters = [filters];
appState.filters = appState.filters.concat(filters);
});
sinon.stub(queryFilter, 'invertFilter', function (filter) {
sinon.stub(queryFilter, 'invertFilter').callsFake((filter) => {
filter.meta.negate = !filter.meta.negate;
});
}));

2
src/ui/public/filters/__tests__/moment.js
View file

@ -20,7 +20,7 @@ const init = function () {
describe('moment formatting filter', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
beforeEach(function () {
sandbox.useFakeTimers(moment(anchor).valueOf());

4
src/ui/public/modals/__tests__/confirm_modal.js
View file

@ -93,8 +93,8 @@ describe('ui/modals/confirm_modal', function () {
};
beforeEach(() => {
confirmCallback.reset();
cancelCallback.reset();
confirmCallback.resetHistory();
cancelCallback.resetHistory();
});
it('onCancel', function () {

2
src/ui/public/saved_objects/__tests__/find_object_by_title.js
View file

@ -4,7 +4,7 @@ import { findObjectByTitle } from '../find_object_by_title';
import { SavedObject } from '../saved_object';
describe('findObjectByTitle', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const savedObjectsClient = {};
beforeEach(() => {

2
src/ui/public/saved_objects/__tests__/saved_objects_client.js
View file

@ -5,7 +5,7 @@ import { SavedObject } from '../saved_object';
describe('SavedObjectsClient', () => {
const basePath = Math.random().toString(36).substring(7);
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const doc = {
id: 'AVwSwFxtcMV38qjDZoQg',
type: 'config',

2
src/ui/public/share/__tests__/url_shortener.js
View file

@ -46,7 +46,7 @@ describe('Url shortener', () => {
let getBasePath;
beforeEach(ngMock.inject((Private) => {
getBasePath = sinon.stub(chrome, 'getBasePath', () => basePath);
getBasePath = sinon.stub(chrome, 'getBasePath').returns(basePath);
urlShortener = Private(UrlShortenerProvider);
}));

2
src/ui/public/state_management/__tests__/state.js
View file

@ -210,7 +210,7 @@ describe('State Management', () => {
it('does not replace the state value on read', () => {
const { state } = setup();
sinon.stub($location, 'search', (newSearch) => {
sinon.stub($location, 'search').callsFake((newSearch) => {
if (newSearch) {
return $location;
} else {

3
src/ui/public/test_harness/test_harness.js
View file

@ -30,7 +30,6 @@ before(() => {
sinon.useFakeXMLHttpRequest();
});
let stubUiSettings = new UiSettingsClient({
defaults: metadata.uiSettings.defaults,
initialSettings: {},
@ -41,7 +40,7 @@ let stubUiSettings = new UiSettingsClient({
}
}
});
sinon.stub(chrome, 'getUiSettingsClient', () => stubUiSettings);
sinon.stub(chrome, 'getUiSettingsClient').callsFake(() => stubUiSettings);
beforeEach(function () {
// ensure that notifications are not left in the notifiers

4
src/ui/public/timepicker/__tests__/toggle.js
View file

@ -5,7 +5,7 @@ import $ from 'jquery';
import sinon from 'sinon';
describe('kbnGlobalTimepicker', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let compile;
let scope;
@ -16,7 +16,7 @@ describe('kbnGlobalTimepicker', function () {
scope = $rootScope.$new();
compile = (timefilterStubProperties = {}) => {
Object.keys(timefilterStubProperties).forEach((key) => {
sandbox.stub(timefilter, key, timefilterStubProperties[key]);
sandbox.stub(timefilter, key).value(timefilterStubProperties[key]);
});
const $el = $('<kbn-global-timepicker></kbn-global-timepicker>');

2
src/ui/public/utils/__tests__/scanner.js
View file

@ -52,7 +52,7 @@ describe('Scanner', function () {
search = sinon.stub().returns(Promise.resolve({ data: mockSearch }));
scroll = sinon.stub().returns(Promise.resolve({ data: mockScroll }));
httpPost = sinon.stub(scanner.$http, 'post', (path, ...args) => {
httpPost = sinon.stub(scanner.$http, 'post').callsFake((path, ...args) => {
if (path.includes('legacy_scroll_start')) {
return search(...args);
}

4
src/ui/public/vis/__tests__/_agg_configs.js
View file

@ -239,9 +239,7 @@ describe('AggConfigs', function () {
const aggInfos = vis.aggs.map(function (aggConfig) {
const football = {};
sinon.stub(aggConfig, 'toDsl', function () {
return football;
});
sinon.stub(aggConfig, 'toDsl').returns(football);
return {
id: aggConfig.id,

2
src/ui/public/vis/__tests__/map/service_settings.js
View file

@ -89,7 +89,7 @@ describe('service_settings (FKA tilemaptest)', function () {
manifestServiceUrlOriginal = mapConfig.manifestServiceUrl;
tilemapsConfigDeprecatedOriginal = tilemapsConfig.deprecated;
sinon.stub(serviceSettings, '_getManifest', function (url) {
sinon.stub(serviceSettings, '_getManifest').callsFake((url) => {
let contents = null;
if (url.startsWith(tmsManifestUrl)) {
contents = tmsManifest;

2
src/ui/public/vis/components/tooltip/__tests__/positioning.js
View file

@ -5,7 +5,7 @@ import sinon from 'sinon';
import { positionTooltip } from '../position_tooltip';
describe('Tooltip Positioning', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
const positions = ['north', 'south', 'east', 'west'];
const bounds = ['top', 'left', 'bottom', 'right', 'area'];
let $window;

4
src/ui/public/visualize/loader/__tests__/loader.js
View file

@ -78,7 +78,7 @@ describe('visualize loader', () => {
// Setup savedObject
mockedSavedObject = createSavedObject();
// Mock savedVisualizations.get to return 'mockedSavedObject' when id is 'exists'
sinon.stub(savedVisualizations, 'get', (id) =>
sinon.stub(savedVisualizations, 'get').callsFake((id) =>
id === 'exists' ? Promise.resolve(mockedSavedObject) : Promise.reject()
);
}));
@ -251,7 +251,7 @@ describe('visualize loader', () => {
expect(spy.notCalled).to.be(true);
container.find('visualize').trigger('renderComplete');
expect(spy.calledOnce).to.be(true);
spy.reset();
spy.resetHistory();
handler.removeRenderCompleteListener(spy);
container.find('visualize').trigger('renderComplete');
expect(spy.notCalled).to.be(true);

2
src/ui/ui_settings/__tests__/ui_settings_mixin_integration.js
View file

@ -13,7 +13,7 @@ import { getUiSettingsServiceForRequest } from '../ui_settings_service_for_reque
import { uiSettingsMixin } from '../ui_settings_mixin';
describe('uiSettingsMixin()', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
async function setup(options = {}) {
const {

2
src/ui/ui_settings/__tests__/ui_settings_service.js
View file

@ -17,7 +17,7 @@ const BUILD_NUM = 1234;
const chance = new Chance();
describe('ui settings', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
function setup(options = {}) {
const {

2
src/ui/ui_settings/create_or_upgrade_saved_config/__tests__/create_or_upgrade_saved_config.js
View file

@ -7,7 +7,7 @@ import { createOrUpgradeSavedConfig } from '../create_or_upgrade_saved_config';
const chance = new Chance();
describe('uiSettings/createOrUpgradeSavedConfig', function () {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
afterEach(() => sandbox.restore());
const version = '4.0.1';

2
src/utils/streams/__tests__/intersperse_stream.js
View file

@ -27,7 +27,7 @@ describe('intersperseStream', () => {
str.write('a');
sinon.assert.calledOnce(stub);
expect(stub.firstCall.args).to.eql(['a']);
stub.reset();
stub.resetHistory();
str.write('b');
sinon.assert.calledTwice(stub);

3
x-pack/package.json
View file

@ -64,8 +64,7 @@
"rsync": "0.4.0",
"run-sequence": "^2.2.1",
"simple-git": "1.37.0",
"sinon": "1.17.3",
"sinon-as-promised": "4.0.3",
"sinon": "^5.0.7",
"supertest": "3.0.0",
"supertest-as-promised": "4.0.2",
"tmp": "0.0.31",

3
x-pack/plugins/reporting/export_types/csv/server/__tests__/execute_job.js
View file

@ -7,7 +7,6 @@
import expect from 'expect.js';
import Puid from 'puid';
import sinon from 'sinon';
import 'sinon-as-promised';
import nodeCrypto from '@elastic/node-crypto';
import { CancellationToken } from '../../../../server/lib/esqueue/helpers/cancellation_token';
@ -370,7 +369,7 @@ describe('CSV Execute Job', function () {
// that delays the Promise resolution so we have a chance to call cancellationToken.cancel().
// Otherwise, we get into an endless loop, and don't have a chance to call cancel
callWithRequestStub.restore();
callWithRequestStub = sinon.stub(clusterStub, 'callWithRequest', async function () {
callWithRequestStub = sinon.stub(clusterStub, 'callWithRequest').callsFake(async function () {
await delay(1);
return {
hits: {

2
x-pack/plugins/reporting/server/lib/__tests__/authorized_user_pre_routing.js
View file

@ -57,7 +57,7 @@ describe('authorized_user_pre_routing', function () {
}
};
callWithRequestStub.reset();
callWithRequestStub.resetHistory();
callWithRequestStub.returns(Promise.resolve(user));
return mockServer;
};

2
x-pack/plugins/reporting/server/lib/__tests__/validate_config.js
View file

@ -12,7 +12,7 @@ describe('Reporting: Validate config', function () {
const log = sinon.spy();
beforeEach(() => {
log.reset();
log.resetHistory();
});
[undefined, null].forEach(value => {

2
x-pack/plugins/reporting/server/lib/esqueue/__tests__/helpers/create_index.js
View file

@ -102,7 +102,7 @@ describe('Create Index', function () {
beforeEach(function () {
client = new ClientMock();
sinon.stub(client.indices, 'exists', () => Promise.resolve(true));
sinon.stub(client.indices, 'exists').callsFake(() => Promise.resolve(true));
createSpy = sinon.spy(client.indices, 'create');
});

4
x-pack/plugins/reporting/server/lib/esqueue/__tests__/job.js
View file

@ -38,7 +38,7 @@ describe('Job Class', function () {
let options;
beforeEach(function () {
createIndexMock.reset();
createIndexMock.resetHistory();
createIndexMock.returns(Promise.resolve('mock'));
index = 'test';
@ -163,7 +163,7 @@ describe('Job Class', function () {
const errMsg = 'test document index failure';
client.index.restore();
sinon.stub(client, 'index', () => Promise.reject(new Error(errMsg)));
sinon.stub(client, 'index').callsFake(() => Promise.reject(new Error(errMsg)));
const job = new Job(mockQueue, index, type, payload);
job.once(constants.EVENT_JOB_CREATE_ERROR, (err) => {

20
x-pack/plugins/reporting/server/lib/esqueue/__tests__/worker.js
View file

@ -211,7 +211,7 @@ describe('Worker class', function () {
it('should start polling for jobs after interval', async function () {
worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
const processPendingJobsStub = sinon.stub(worker, '_processPendingJobs', () => Promise.resolve());
const processPendingJobsStub = sinon.stub(worker, '_processPendingJobs').callsFake(() => Promise.resolve());
sinon.assert.notCalled(processPendingJobsStub);
await allowPoll(defaultWorkerOptions.interval);
sinon.assert.calledOnce(processPendingJobsStub);
@ -220,7 +220,7 @@ describe('Worker class', function () {
it('should use interval option to control polling', async function () {
const interval = 567;
worker = new Worker(mockQueue, 'test', noop, { ...defaultWorkerOptions, interval });
const processPendingJobsStub = sinon.stub(worker, '_processPendingJobs', () => Promise.resolve());
const processPendingJobsStub = sinon.stub(worker, '_processPendingJobs').callsFake(() => Promise.resolve());
sinon.assert.notCalled(processPendingJobsStub);
await allowPoll(interval);
@ -230,7 +230,7 @@ describe('Worker class', function () {
it('should not poll once destroyed', async function () {
worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
const processPendingJobsStub = sinon.stub(worker, '_processPendingJobs', () => Promise.resolve());
const processPendingJobsStub = sinon.stub(worker, '_processPendingJobs').callsFake(() => Promise.resolve());
// move the clock a couple times, test for searches each time
sinon.assert.notCalled(processPendingJobsStub);
@ -266,7 +266,7 @@ describe('Worker class', function () {
it('should not use error multiplier when processPendingJobs resolved the Promise', async function () {
worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
const processPendingJobsStub = sinon.stub(worker, "_processPendingJobs", () => Promise.resolve());
const processPendingJobsStub = sinon.stub(worker, "_processPendingJobs").callsFake(() => Promise.resolve());
await allowPoll(defaultWorkerOptions.interval);
expect(processPendingJobsStub.callCount).to.be(1);
@ -289,7 +289,7 @@ describe('Worker class', function () {
});
it('should pass search errors', function (done) {
searchStub = sinon.stub(mockQueue.client, 'search', () => Promise.reject());
searchStub = sinon.stub(mockQueue.client, 'search').callsFake(() => Promise.reject());
worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
worker._getPendingJobs()
.then(() => done(new Error('should not resolve')))
@ -301,7 +301,7 @@ describe('Worker class', function () {
describe('missing index', function () {
it('should swallow error', function (done) {
searchStub = sinon.stub(mockQueue.client, 'search', () => Promise.reject({
searchStub = sinon.stub(mockQueue.client, 'search').callsFake(() => Promise.reject({
status: 404
}));
worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
@ -311,7 +311,7 @@ describe('Worker class', function () {
});
it('should return an empty array', function (done) {
searchStub = sinon.stub(mockQueue.client, 'search', () => Promise.reject({
searchStub = sinon.stub(mockQueue.client, 'search').callsFake(() => Promise.reject({
status: 404
}));
worker = new Worker(mockQueue, 'test', noop, defaultWorkerOptions);
@ -333,7 +333,7 @@ describe('Worker class', function () {
describe('query parameters', function () {
beforeEach(() => {
searchStub = sinon.stub(mockQueue.client, 'search', () => Promise.resolve({ hits: { hits: [] } }));
searchStub = sinon.stub(mockQueue.client, 'search').callsFake(() => Promise.resolve({ hits: { hits: [] } }));
});
it('should query with version', function () {
@ -358,7 +358,7 @@ describe('Worker class', function () {
const jobtype = 'test_jobtype';
beforeEach(() => {
searchStub = sinon.stub(mockQueue.client, 'search', () => Promise.resolve({ hits: { hits: [] } }));
searchStub = sinon.stub(mockQueue.client, 'search').callsFake(() => Promise.resolve({ hits: { hits: [] } }));
anchorMoment = moment(anchor);
clock = sinon.useFakeTimers(anchorMoment.valueOf());
});
@ -907,7 +907,7 @@ describe('Worker class', function () {
};
beforeEach(function () {
sinon.stub(mockQueue.client, 'search', () => Promise.resolve({ hits: { hits: [] } }));
sinon.stub(mockQueue.client, 'search').callsFake(() => Promise.resolve({ hits: { hits: [] } }));
});
describe('workerFn rejects promise', function () {

9
x-pack/plugins/security/server/lib/__tests__/auth_redirect.js
View file

@ -111,7 +111,14 @@ describe('lib/auth_redirect', function () {
await authenticate(request, reply);
sinon.assert.calledWithExactly(reply, Boom.unauthorized());
sinon.assert.calledWithExactly(
reply,
sinon.match({
isBoom: true,
message: 'Unauthorized',
output: { statusCode: 401 },
})
);
sinon.assert.notCalled(reply.redirect);
sinon.assert.notCalled(reply.continue);
});

4
x-pack/plugins/security/server/lib/__tests__/validate_config.js
View file

@ -10,7 +10,7 @@ import { validateConfig } from '../validate_config';
describe('Validate config', function () {
let config;
const log = sinon.spy();
const log = sinon.stub();
const validKey = 'd624dce49dafa1401be7f3e1182b756a';
beforeEach(() => {
@ -18,7 +18,7 @@ describe('Validate config', function () {
get: sinon.stub(),
set: sinon.stub()
};
log.reset();
log.resetHistory();
});
it('should log a warning and set xpack.security.encryptionKey if not set', function () {

2
x-pack/plugins/security/server/lib/authentication/__tests__/authenticator.js
View file

@ -16,7 +16,7 @@ import { initAuthenticator } from '../authenticator';
import * as ClientShield from '../../../../../../server/lib/get_client_shield';
describe('Authenticator', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let config;
let server;

6
x-pack/plugins/security/server/lib/authentication/__tests__/session.js
View file

@ -11,7 +11,7 @@ import { serverFixture } from '../../__tests__/__fixtures__/server';
import { Session } from '../session';
describe('Session', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let server;
let config;
@ -110,14 +110,14 @@ describe('Session', () => {
sinon.assert.calledOnce(callback);
sinon.assert.calledWithExactly(callback, null, true, sessionWithoutExpires);
callback.reset();
callback.resetHistory();
const notExpiredSession = { token: 'token', expires: currentTime + 1 };
validateFunc({}, notExpiredSession, callback);
sinon.assert.calledOnce(callback);
sinon.assert.calledWithExactly(callback, null, true, notExpiredSession);
callback.reset();
callback.resetHistory();
const expiredSession = { token: 'token', expires: currentTime - 1 };
validateFunc({}, expiredSession, callback);

54
x-pack/plugins/security/server/routes/api/v1/__tests__/authenticate.js
View file

@ -93,7 +93,15 @@ describe('Authentication routes', () => {
sinon.assert.notCalled(replyStub.continue);
sinon.assert.calledOnce(replyStub);
sinon.assert.calledWithExactly(replyStub, Boom.unauthorized(failureReason));
sinon.assert.calledWithExactly(
replyStub,
sinon.match({
isBoom: true,
message: failureReason.toString(),
output: { statusCode: 401 },
})
);
});
it('returns 401 if authentication is not handled.', async () => {
@ -105,7 +113,15 @@ describe('Authentication routes', () => {
sinon.assert.notCalled(replyStub.continue);
sinon.assert.calledOnce(replyStub);
sinon.assert.calledWithExactly(replyStub, Boom.unauthorized());
sinon.assert.calledWithExactly(
replyStub,
sinon.match({
isBoom: true,
message: 'Unauthorized',
output: { statusCode: 401 },
})
);
});
it('returns user data if authentication succeed.', async () => {
@ -183,7 +199,11 @@ describe('Authentication routes', () => {
sinon.assert.calledOnce(replyStub);
sinon.assert.calledWithExactly(
replyStub,
Boom.badRequest('Client should be able to process redirect response.')
sinon.match({
isBoom: true,
message: 'Client should be able to process redirect response.',
output: { statusCode: 400 }
})
);
sinon.assert.notCalled(replyStub.continue);
sinon.assert.notCalled(replyStub.redirect);
@ -323,7 +343,14 @@ describe('Authentication routes', () => {
sinon.assert.notCalled(replyStub.continue);
sinon.assert.notCalled(replyStub.redirect);
sinon.assert.calledOnce(replyStub);
sinon.assert.calledWithExactly(replyStub, Boom.unauthorized(failureReason));
sinon.assert.calledWithExactly(
replyStub,
sinon.match({
isBoom: true,
message: failureReason.toString(),
output: { statusCode: 401 }
})
);
});
it('returns 401 if authentication is not handled.', async () => {
@ -336,7 +363,14 @@ describe('Authentication routes', () => {
sinon.assert.notCalled(replyStub.continue);
sinon.assert.notCalled(replyStub.redirect);
sinon.assert.calledOnce(replyStub);
sinon.assert.calledWithExactly(replyStub, Boom.unauthorized());
sinon.assert.calledWithExactly(
replyStub,
sinon.match({
isBoom: true,
message: 'Unauthorized',
output: { statusCode: 401 }
})
);
});
it('returns 403 if there an active session exists.', async () => {
@ -351,10 +385,12 @@ describe('Authentication routes', () => {
sinon.assert.calledOnce(replyStub);
sinon.assert.calledWithExactly(
replyStub,
Boom.forbidden(
'Sorry, you already have an active Kibana session. ' +
'If you want to start a new one, please logout from the existing session first.'
)
sinon.match({
isBoom: true,
message: 'Sorry, you already have an active Kibana session. ' +
'If you want to start a new one, please logout from the existing session first.',
output: { statusCode: 403 }
})
);
});

2
x-pack/plugins/security/server/routes/api/v1/__tests__/users.js
View file

@ -15,7 +15,7 @@ import { initUsersApi } from '../users';
import * as ClientShield from '../../../../../../../server/lib/get_client_shield';
describe('User routes', () => {
const sandbox = sinon.sandbox.create();
const sandbox = sinon.createSandbox();
let clusterStub;
let serverStub;

Some files were not shown because too many files have changed in this diff Show more