f50438e76f
* ui: Split up client/http and replace $.ajax This splits the client/http service more in the following ways: 1. Connections are now split out into its own service 2. The transport is now split out into its own service that returns a listener based http transport 3. Various string parsing/stringifying functions are now split out into utils * Remove jQuery from our production build * Move the coverage serving to the server.js file * Self review amends * Add X-Requested-With header * Move some files around, externalize some functions * Move connection tracking to use native Set * Ensure HTTP parsing doesn't encode headers In the future this will change to deal with all HTTP parsing in one place, hence the commented out METHOD_PARSING etc * Start to fix up integration tests to use requestParams
144 lines
4.8 KiB
JavaScript
144 lines
4.8 KiB
JavaScript
import { module, test } from 'qunit';
|
|
import { setupTest } from 'ember-qunit';
|
|
import { env } from '../../../env';
|
|
const shouldHaveNspace = function(nspace) {
|
|
return typeof nspace !== 'undefined' && env('CONSUL_NSPACES_ENABLED');
|
|
};
|
|
module('Integration | Adapter | kv', function(hooks) {
|
|
setupTest(hooks);
|
|
const dc = 'dc-1';
|
|
const id = 'key-name/here';
|
|
const undefinedNspace = 'default';
|
|
[undefinedNspace, 'team-1', undefined].forEach(nspace => {
|
|
test(`requestForQuery returns the correct url/method when nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `GET /v1/kv/${id}?keys&dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
let actual = adapter.requestForQuery(client.requestParams.bind(client), {
|
|
dc: dc,
|
|
id: id,
|
|
ns: nspace,
|
|
});
|
|
assert.equal(`${actual.method} ${actual.url}`, expected);
|
|
});
|
|
test(`requestForQueryRecord returns the correct url/method when nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `GET /v1/kv/${id}?dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
let actual = adapter.requestForQueryRecord(client.requestParams.bind(client), {
|
|
dc: dc,
|
|
id: id,
|
|
ns: nspace,
|
|
});
|
|
assert.equal(`${actual.method} ${actual.url}`, expected);
|
|
});
|
|
test(`requestForCreateRecord returns the correct url/method when nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `PUT /v1/kv/${id}?dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
let actual = adapter
|
|
.requestForCreateRecord(
|
|
client.url,
|
|
{},
|
|
{
|
|
Datacenter: dc,
|
|
Key: id,
|
|
Value: '',
|
|
Namespace: nspace,
|
|
}
|
|
)
|
|
.split('\n')
|
|
.shift();
|
|
assert.equal(actual, expected);
|
|
});
|
|
test(`requestForUpdateRecord returns the correct url/method when nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const flags = 12;
|
|
const expected = `PUT /v1/kv/${id}?dc=${dc}&flags=${flags}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
let actual = adapter
|
|
.requestForUpdateRecord(
|
|
client.url,
|
|
{},
|
|
{
|
|
Datacenter: dc,
|
|
Key: id,
|
|
Value: '',
|
|
Namespace: nspace,
|
|
Flags: flags,
|
|
}
|
|
)
|
|
.split('\n')
|
|
.shift();
|
|
assert.equal(actual, expected);
|
|
});
|
|
test(`requestForDeleteRecord returns the correct url/method when the nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const expected = `DELETE /v1/kv/${id}?dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}`;
|
|
let actual = adapter
|
|
.requestForDeleteRecord(
|
|
client.url,
|
|
{},
|
|
{
|
|
Datacenter: dc,
|
|
Key: id,
|
|
Namespace: nspace,
|
|
}
|
|
)
|
|
.split('\n')
|
|
.shift();
|
|
assert.equal(actual, expected);
|
|
});
|
|
test(`requestForDeleteRecord returns the correct url/method for folders when nspace is ${nspace}`, function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
const folder = `${id}/`;
|
|
const expected = `DELETE /v1/kv/${folder}?dc=${dc}${
|
|
shouldHaveNspace(nspace) ? `&ns=${nspace}` : ``
|
|
}&recurse`;
|
|
let actual = adapter
|
|
.requestForDeleteRecord(
|
|
client.url,
|
|
{},
|
|
{
|
|
Datacenter: dc,
|
|
Key: folder,
|
|
Namespace: nspace,
|
|
}
|
|
)
|
|
.split('\n')
|
|
.shift();
|
|
assert.equal(actual, expected);
|
|
});
|
|
});
|
|
test("requestForQuery throws if you don't specify an id", function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
assert.throws(function() {
|
|
adapter.requestForQuery(client.url, {
|
|
dc: dc,
|
|
});
|
|
});
|
|
});
|
|
test("requestForQueryRecord throws if you don't specify an id", function(assert) {
|
|
const adapter = this.owner.lookup('adapter:kv');
|
|
const client = this.owner.lookup('service:client/http');
|
|
assert.throws(function() {
|
|
adapter.requestForQueryRecord(client.url, {
|
|
dc: dc,
|
|
});
|
|
});
|
|
});
|
|
});
|