Skip to content

Commit

Permalink
Move ng_mock wrapper to test_utils (#17712)
Browse files Browse the repository at this point in the history
  • Loading branch information
timroes authored Apr 17, 2018
1 parent 56690d1 commit 07cf4b6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function getWebpackConfig(source, projectRoot, config) {
'moment-timezone$': fromKibana('webpackShims/moment-timezone'),

// Dev defaults for test bundle https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/core_plugins/tests_bundle/index.js#L73-L78
ng_mock$: fromKibana('src/core_plugins/dev_mode/public/ng_mock'),
ng_mock$: fromKibana('src/test_utils/public/ng_mock'),
'angular-mocks$': fromKibana(
'src/core_plugins/tests_bundle/webpackShims/angular-mocks.js'
),
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/tests_bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default (kibana) => {
},

__globalImportAliases__: {
ng_mock$: fromRoot('src/core_plugins/dev_mode/public/ng_mock'),
ng_mock$: fromRoot('src/test_utils/public/ng_mock'),
'angular-mocks$': require.resolve('./webpackShims/angular-mocks'),
fixtures: fromRoot('src/fixtures'),
test_utils: fromRoot('src/test_utils/public'),
Expand Down
File renamed without changes.

0 comments on commit 07cf4b6

Please sign in to comment.