kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-03 08:55:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to handle region switching

Browse Source
This commit is contained in:
Michael Lange
2018-08-09 15:35:25 -07:00
parent 822d99833b
commit b767a87422
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ui/tests/integration/task-log-test.js
View File

@@ -56,6 +56,7 @@ moduleForComponent('task-log', 'Integration | Component | task log', {
this.server = new Pretender(function() {
this.get(`http://${HOST}/v1/client/fs/logs/:allocation_id`, handler);
this.get('/v1/client/fs/logs/:allocation_id', handler);
this.get('/v1/regions', () => [200, {}, '[]']);
});
},
afterEach() {

14
ui/tests/unit/adapters/job-test.js
View File

@@ -41,7 +41,13 @@ moduleForAdapter('job', 'Unit | Adapter | Job', {
this.server.create('job', { id: 'job-2', namespaceId: 'some-namespace' });
this.system = getOwner(this).lookup('service:system');
// Namespace, default region, and all regions are requests that all
// job requests depend on. Fetching them ahead of time means testing
// job adapter behavior in isolation.
this.system.get('namespaces');
this.system.get('shouldIncludeRegion');
this.system.get('defaultRegion');
// Reset the handledRequests array to avoid accounting for this
// namespaces request everywhere.
@@ -83,8 +89,8 @@ test('When a namespace is set in localStorage but a job in the default namespace
assert.deepEqual(
pretender.handledRequests.mapBy('url'),
['/v1/namespaces', `/v1/job/${jobName}`],
'The only requests made are /namespaces and /job/:id with no namespace query param'
[`/v1/job/${jobName}`],
'The only request made is /job/:id with no namespace query param'
);
});
});
@@ -168,7 +174,7 @@ test('findAll can be watched', function(assert) {
request();
assert.equal(
pretender.handledRequests[1].url,
pretender.handledRequests[0].url,
'/v1/jobs?index=1',
'Second request is a blocking request for jobs'
);
@@ -176,7 +182,7 @@ test('findAll can be watched', function(assert) {
return wait().then(() => {
request();
assert.equal(
pretender.handledRequests[2].url,
pretender.handledRequests[1].url,
'/v1/jobs?index=2',
'Third request is a blocking request with an incremented index param'
);