Skip to content

Commit

Permalink
fix renamed import
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshustov
mshustov committed Dec 12, 2019
1 parent d3a899b commit d1f9936
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/xpack_main/server/lib/__tests__/xpack_info.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { BehaviorSubject } from 'rxjs';
import expect from '@kbn/expect';
import sinon from 'sinon';
import { XPackInfo } from '../xpack_info';
import { licenseMock } from '../../../../../../plugins/licensing/server/licensing.mock';
import { licensingMock } from '../../../../../../plugins/licensing/server/licensing.mock';

function createLicense(license = {}, features = {}) {
return licenseMock.create({
return licensingMock.createLicense({
license: {
uid: 'custom-uid',
type: 'gold',
Expand Down
44 changes: 22 additions & 22 deletions x-pack/legacy/plugins/xpack_main/server/lib/xpack_info_license.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { licenseMock } from '../../../../../plugins/licensing/server/licensing.mock';
import { licensingMock } from '../../../../../plugins/licensing/server/licensing.mock';
import { XPackInfoLicense } from './xpack_info_license';

function getXPackInfoLicense(getRawLicense) {
Expand All @@ -25,7 +25,7 @@ describe('XPackInfoLicense', () => {
test('getUid returns uid field', () => {
const uid = 'abc123';

getRawLicense.mockReturnValue(licenseMock.create({ license: { uid } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { uid } }));

expect(xpackInfoLicense.getUid()).toBe(uid);
expect(getRawLicense).toHaveBeenCalledTimes(1);
Expand All @@ -34,14 +34,14 @@ describe('XPackInfoLicense', () => {
});

test('isActive returns true if status is active', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active' } }));

expect(xpackInfoLicense.isActive()).toBe(true);
expect(getRawLicense).toHaveBeenCalledTimes(1);
});

test('isActive returns false if status is not active', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'aCtIvE' } })); // needs to match exactly
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'aCtIvE' } })); // needs to match exactly

expect(xpackInfoLicense.isActive()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(1);
Expand All @@ -50,7 +50,7 @@ describe('XPackInfoLicense', () => {
});

test('getExpiryDateInMillis returns expiry_date_in_millis', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { expiryDateInMillis: 123 } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { expiryDateInMillis: 123 } }));

expect(xpackInfoLicense.getExpiryDateInMillis()).toBe(123);
expect(getRawLicense).toHaveBeenCalledTimes(1);
Expand All @@ -59,7 +59,7 @@ describe('XPackInfoLicense', () => {
});

test('isOneOf returns true of the mode includes one of the types', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { mode: 'platinum' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { mode: 'platinum' } }));

expect(xpackInfoLicense.isOneOf('platinum')).toBe(true);
expect(getRawLicense).toHaveBeenCalledTimes(1);
Expand All @@ -79,12 +79,12 @@ describe('XPackInfoLicense', () => {
});

test('getType returns the type', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { type: 'basic' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { type: 'basic' } }));

expect(xpackInfoLicense.getType()).toBe('basic');
expect(getRawLicense).toHaveBeenCalledTimes(1);

getRawLicense.mockReturnValue(licenseMock.create({ license: { type: 'gold' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { type: 'gold' } }));

expect(xpackInfoLicense.getType()).toBe('gold');
expect(getRawLicense).toHaveBeenCalledTimes(2);
Expand All @@ -93,12 +93,12 @@ describe('XPackInfoLicense', () => {
});

test('getMode returns the mode', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { mode: 'basic' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { mode: 'basic' } }));

expect(xpackInfoLicense.getMode()).toBe('basic');
expect(getRawLicense).toHaveBeenCalledTimes(1);

getRawLicense.mockReturnValue(licenseMock.create({ license: { mode: 'gold' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { mode: 'gold' } }));

expect(xpackInfoLicense.getMode()).toBe('gold');
expect(getRawLicense).toHaveBeenCalledTimes(2);
Expand All @@ -109,22 +109,22 @@ describe('XPackInfoLicense', () => {
test('isActiveLicense returns the true if active and typeChecker matches', () => {
const expectAbc123 = type => type === 'abc123';

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active', mode: 'abc123' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active', mode: 'abc123' } }));

expect(xpackInfoLicense.isActiveLicense(expectAbc123)).toBe(true);
expect(getRawLicense).toHaveBeenCalledTimes(1);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'NOTactive', mode: 'abc123' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'NOTactive', mode: 'abc123' } }));

expect(xpackInfoLicense.isActiveLicense(expectAbc123)).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(2);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'NOTactive', mode: 'NOTabc123' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'NOTactive', mode: 'NOTabc123' } }));

expect(xpackInfoLicense.isActiveLicense(expectAbc123)).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(3);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active', mode: 'NOTabc123' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active', mode: 'NOTabc123' } }));

expect(xpackInfoLicense.isActiveLicense(expectAbc123)).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(4);
Expand All @@ -133,22 +133,22 @@ describe('XPackInfoLicense', () => {
});

test('isBasic returns the true if active and basic', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active', mode: 'basic' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active', mode: 'basic' } }));

expect(xpackInfoLicense.isBasic()).toBe(true);
expect(getRawLicense).toHaveBeenCalledTimes(1);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'NOTactive', mode: 'gold' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'NOTactive', mode: 'gold' } }));

expect(xpackInfoLicense.isBasic()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(2);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'NOTactive', mode: 'trial' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'NOTactive', mode: 'trial' } }));

expect(xpackInfoLicense.isBasic()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(3);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active', mode: 'platinum' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active', mode: 'platinum' } }));

expect(xpackInfoLicense.isBasic()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(4);
Expand All @@ -158,22 +158,22 @@ describe('XPackInfoLicense', () => {


test('isNotBasic returns the true if active and not basic', () => {
getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active', mode: 'platinum' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active', mode: 'platinum' } }));

expect(xpackInfoLicense.isNotBasic()).toBe(true);
expect(getRawLicense).toHaveBeenCalledTimes(1);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'NOTactive', mode: 'gold' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'NOTactive', mode: 'gold' } }));

expect(xpackInfoLicense.isNotBasic()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(2);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'NOTactive', mode: 'trial' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'NOTactive', mode: 'trial' } }));

expect(xpackInfoLicense.isNotBasic()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(3);

getRawLicense.mockReturnValue(licenseMock.create({ license: { status: 'active', mode: 'basic' } }));
getRawLicense.mockReturnValue(licensingMock.createLicense({ license: { status: 'active', mode: 'basic' } }));

expect(xpackInfoLicense.isNotBasic()).toBe(false);
expect(getRawLicense).toHaveBeenCalledTimes(4);
Expand Down

0 comments on commit d1f9936

Please sign in to comment.