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

[6.x] Remove testURL hotfix from jest upgrade (#22953) (#22977)

Browse source 
Backports the following commits to 6.x:
 - Remove testURL hotfix from jest upgrade  (#22953)
This commit is contained in:
Spencer 2018-09-12 17:38:08 -07:00 • committed by GitHub
parent fcdebbb44c
commit a82af2817e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core_plugins/console/public/tests/src/input_tokenization.test.js
View file

@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
import './setup_mocks';
import ace from 'brace';
import 'brace/mode/json';
const $ = require('jquery');
import $ from 'jquery';
import { initializeInput } from '../../src/input';
const tokenIterator = ace.acequire('ace/token_iterator');
describe('Input Tokenization', () => {

8
src/core_plugins/console/public/tests/src/setup_mocks.js
View file

@ -23,4 +23,10 @@ window.URL = {
createObjectURL: () => { return ''; }
};
jest.mock('../../src/storage');
document.queryCommandSupported = () => true;
document.queryCommandSupported = () => true;
import jQuery from 'jquery';
jest.spyOn(jQuery, 'ajax').mockImplementation(() => new Promise(() => {
// never resolve
}));

2
src/dev/jest/config.js
View file

@ -96,6 +96,4 @@ export default {
'default',
'<rootDir>/src/dev/jest/junit_reporter.js',
],
// TODO: prevent tests from making web requests that rely on this setting, see https://github.com/facebook/jest/pull/6792
testURL: 'about:blank',
};

4
src/ui/public/share/components/__snapshots__/url_panel_content.test.js.snap
View file

@ -129,7 +129,7 @@ exports[`render 1`] = `
<EuiCopy
afterMessage="Copied"
anchorClassName="sharePanel__copyAnchor"
textToCopy="about:blank"
textToCopy="http://localhost/"
/>
</EuiForm>
`;
@ -262,7 +262,7 @@ exports[`should enable saved object export option when objectId is provided 1`]
<EuiCopy
afterMessage="Copied"
anchorClassName="sharePanel__copyAnchor"
textToCopy="about:blank"
textToCopy="http://localhost/"
/>
</EuiForm>
`;

2
x-pack/dev-tools/jest/create_jest_config.js
View file

@ -51,7 +51,5 @@ export function createJestConfig({
rootDirectory: xPackKibanaDirectory,
}]
],
// TODO: prevent tests from making web requests that rely on this setting, see https://github.com/facebook/jest/pull/6792
testURL: 'about:blank',
};
}