Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ const del = require('del');

const PLUGIN_FIXTURE = resolve(__dirname, '__fixtures__/build_action_test_plugin');
const PLUGIN_BUILD_DIR = resolve(PLUGIN_FIXTURE, 'build');
const PLUGIN = require('../../lib/plugin_config')(PLUGIN_FIXTURE);
const PLUGIN = require('../../../lib/plugin_config')(PLUGIN_FIXTURE);
const noop = () => {};

describe('creating build zip', () => {
const buildAction = require('./build_action');
const buildAction = require('../build_action');

beforeEach(() => del(PLUGIN_BUILD_DIR));
afterEach(() => del(PLUGIN_BUILD_DIR));
Expand Down Expand Up @@ -58,8 +58,16 @@ describe('calling create_build', () => {
beforeEach(() => {
jest.resetModules();
mockBuild = jest.fn(() => Promise.resolve());
jest.mock('./create_build', () => mockBuild);
buildAction = require('./build_action');
jest.mock('../create_build', () => mockBuild);
buildAction = require('../build_action');
});

const nameArgs = ([plugin, buildTarget, buildVersion, kibanaVersion, files]) => ({
plugin,
buildTarget,
buildVersion,
kibanaVersion,
files,
});

it('takes optional build version', async () => {
Expand All @@ -72,13 +80,7 @@ describe('calling create_build', () => {

expect(mockBuild.mock.calls).toHaveLength(1);

const [
plugin, // eslint-disable-line no-unused-vars
buildTarget, // eslint-disable-line no-unused-vars
buildVersion,
kibanaVersion,
files, // eslint-disable-line no-unused-vars
] = mockBuild.mock.calls[0];
const { buildVersion, kibanaVersion } = nameArgs(mockBuild.mock.calls[0]);
expect(buildVersion).toBe('1.2.3');
expect(kibanaVersion).toBe('4.5.6');
});
Expand All @@ -88,13 +90,7 @@ describe('calling create_build', () => {

expect(mockBuild.mock.calls).toHaveLength(1);

const [
plugin, // eslint-disable-line no-unused-vars
buildTarget, // eslint-disable-line no-unused-vars
buildVersion, // eslint-disable-line no-unused-vars
kibanaVersion, // eslint-disable-line no-unused-vars
files,
] = mockBuild.mock.calls[0];
const { files } = nameArgs(mockBuild.mock.calls[0]);
PLUGIN.buildSourcePatterns.forEach(file => expect(files).toContain(file));
});

Expand All @@ -107,13 +103,7 @@ describe('calling create_build', () => {

expect(mockBuild.mock.calls).toHaveLength(1);

const [
plugin, // eslint-disable-line no-unused-vars
buildTarget, // eslint-disable-line no-unused-vars
buildVersion, // eslint-disable-line no-unused-vars
kibanaVersion, // eslint-disable-line no-unused-vars
files,
] = mockBuild.mock.calls[0];
const { files } = nameArgs(mockBuild.mock.calls[0]);
options.files.forEach(file => expect(files).toContain(file));
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
const { resolve } = require('path');
const { readdirSync, existsSync, unlink } = require('fs');
const del = require('del');
const createBuild = require('./create_build');
const createBuild = require('../create_build');

const PLUGIN_FIXTURE = resolve(__dirname, '__fixtures__/create_build_test_plugin');
const PLUGIN = require('../../lib/plugin_config')(PLUGIN_FIXTURE);
const PLUGIN = require('../../../lib/plugin_config')(PLUGIN_FIXTURE);
const PLUGIN_BUILD_DIR = resolve(PLUGIN_FIXTURE, 'build');
const PLUGIN_BUILD_TARGET = resolve(PLUGIN_BUILD_DIR, 'kibana', PLUGIN.id);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
const { resolve } = require('path');
const { statSync } = require('fs');
const del = require('del');
const createBuild = require('./create_build');
const createPackage = require('./create_package');
const createBuild = require('../create_build');
const createPackage = require('../create_package');

const PLUGIN_FIXTURE = resolve(__dirname, '__fixtures__/create_package_test_plugin');
const PLUGIN = require('../../lib/plugin_config')(PLUGIN_FIXTURE);
const PLUGIN = require('../../../lib/plugin_config')(PLUGIN_FIXTURE);
const PLUGIN_BUILD_DIR = resolve(PLUGIN_FIXTURE, 'build-custom');

const buildVersion = PLUGIN.version;
Expand Down