Skip to content

Commit 3099bb0

Browse files
committed
[ui/vis_maps/tests] stub tilemapsConfig rather than monkey-patching it
1 parent dff8315 commit 3099bb0

File tree

2 files changed

+36
-11
lines changed

2 files changed

+36
-11
lines changed

src/ui/public/vis_maps/__tests__/tile_maps/tilemap_settings.js

+19-7
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,28 @@ describe('tilemaptest - TileMapSettingsTests-deprecated', function () {
66
let tilemapSettings;
77
let tilemapsConfig;
88

9-
beforeEach(ngMock.module('kibana'));
9+
beforeEach(ngMock.module('kibana', ($provide) => {
10+
$provide.decorator('tilemapsConfig', () => ({
11+
manifestServiceUrl: 'https://proxy-tiles.elastic.co/v1/manifest',
12+
deprecated: {
13+
isOverridden: true,
14+
config: {
15+
url: 'https://tiles.elastic.co/v1/default/{z}/{x}/{y}.png?my_app_name=kibana_tests',
16+
options: {
17+
minZoom: 1,
18+
maxZoom: 10,
19+
attribution: '© [Elastic Tile Service](https://www.elastic.co/elastic_tile_service)'
20+
}
21+
},
22+
}
23+
}));
24+
}));
25+
1026
beforeEach(ngMock.inject(function ($injector) {
1127
tilemapSettings = $injector.get('tilemapSettings');
1228
tilemapsConfig = $injector.get('tilemapsConfig');
13-
tilemapsConfig.deprecated.isOverridden = true;
1429
}));
1530

16-
1731
describe('getting settings', function () {
1832
beforeEach(async function () {
1933
await tilemapSettings.loadSettings();
@@ -27,10 +41,8 @@ describe('tilemaptest - TileMapSettingsTests-deprecated', function () {
2741
expect(mapUrl).to.contain('{z}');
2842

2943
const urlObject = url.parse(mapUrl, true);
30-
expect(urlObject.host).to.match(/elastic.co$/);
31-
expect(urlObject.query).to.have.property('my_app_name');
32-
expect(urlObject.query).to.have.property('my_app_version');
33-
expect(urlObject.query).to.have.property('elastic_tile_service_tos');
44+
expect(urlObject.hostname).to.be('tiles.elastic.co');
45+
expect(urlObject.query).to.have.property('my_app_name', 'kibana_tests');
3446

3547
});
3648

src/ui/public/vis_maps/__tests__/tile_maps/tilemap_settings_mocked.js

+17-4
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,33 @@ describe('tilemaptest - TileMapSettingsTests-mocked', function () {
3333
};
3434
};
3535

36-
beforeEach(ngMock.module('kibana'));
36+
beforeEach(ngMock.module('kibana', ($provide) => {
37+
$provide.decorator('tilemapsConfig', () => ({
38+
manifestServiceUrl: 'http://foo.bar/manifest',
39+
deprecated: {
40+
isOverridden: false,
41+
config: {
42+
url: '',
43+
options: {
44+
minZoom: 1,
45+
maxZoom: 10,
46+
attribution: '© [Elastic Tile Service](https://www.elastic.co/elastic_tile_service)'
47+
}
48+
},
49+
}
50+
}));
51+
}));
52+
3753
beforeEach(ngMock.inject(function ($injector) {
3854
tilemapSettings = $injector.get('tilemapSettings');
3955
tilemapsConfig = $injector.get('tilemapsConfig');
4056

41-
//mock the use of a manifest
42-
tilemapsConfig.deprecated.isOverridden = false;
4357
oldGetManifest = tilemapSettings._getTileServiceManifest;
4458
tilemapSettings._getTileServiceManifest = mockGetManifest;
4559
}));
4660

4761
afterEach(function () {
4862
//restore overrides.
49-
tilemapsConfig.isOverridden = true;
5063
tilemapSettings._getTileServiceManifest = oldGetManifest;
5164
});
5265

0 commit comments

Comments
 (0)