45e43adb63
This PR supersedes #10706 and fixes #10686 whilst making sure that saving intentions continues to work. The original fix in #10706 ignored the change action configured for the change event on the menus, meaning that the selected source/destination namespace could not be set by the user when editing/creating intentions. This, coupled with the fact that using the later intention exact endpoint for API requests endpoint means that you could not use wildcard namespaces for saving intentions. All in all this meant that intentions could no longer be saved using the UI (whilst using ENT) This PR reverts #10706 to fix the intention saving issue, and adds a fix for the original visual issue of nspaces doubling up in the menu once clicked. This meant repeating the existing functionality for nspaces aswell as services. It did seem strange to me that the original issue was only apparent for the nspace menus and not the service menus which should all function exactly the same way. There is potentially more to come here partly related to what the exact functionality should be, but I'm working with other folks to figure out what the best way forwards is longer term. In the meantime this brings us back to the original functionality with the visual issue fixed. Squashed commits: * Revert "ui: Fix dropdown option duplications (#10706)" This reverts commit eb5512fb74781ea49be743e2f0f16b3f1863ef61. * ui: Ensure additional nspaces are added to the unique list of nspaces * Add some acceptance tests
83 lines
3.3 KiB
JavaScript
83 lines
3.3 KiB
JavaScript
const dont = `( don't| shouldn't| can't)?`;
|
|
export default function(scenario, assert, pauseUntil, find, currentURL, clipboard) {
|
|
scenario
|
|
.then('pause until I see the text "$text" in "$selector"', function(text, selector) {
|
|
return pauseUntil(function(resolve, reject, retry) {
|
|
const $el = find(selector);
|
|
if ($el) {
|
|
const hasText = $el.textContent.indexOf(text) !== -1;
|
|
if (hasText) {
|
|
return resolve();
|
|
}
|
|
return reject();
|
|
}
|
|
return retry();
|
|
}, `Expected to see "${text}" in "${selector}"`);
|
|
})
|
|
.then([`I${dont} see the text "$text" in "$selector"`], function(negative, text, selector) {
|
|
const textContent = (find(selector) || { textContent: '' }).textContent;
|
|
assert[negative ? 'notOk' : 'ok'](
|
|
textContent.indexOf(text) !== -1,
|
|
`Expected${negative ? ' not' : ''} to see "${text}" in "${selector}", was "${textContent}"`
|
|
);
|
|
})
|
|
.then(['I copied "$text"'], function(text) {
|
|
const copied = clipboard();
|
|
assert.ok(
|
|
copied.indexOf(text) !== -1,
|
|
`Expected to see "${text}" in the clipboard, was "${copied}"`
|
|
);
|
|
})
|
|
.then(['I see the exact text "$text" in "$selector"'], function(text, selector) {
|
|
assert.ok(
|
|
find(selector).textContent.trim() === text,
|
|
`Expected to see the exact "${text}" in "${selector}"`
|
|
);
|
|
})
|
|
// TODO: Think of better language
|
|
// TODO: These should be mergeable
|
|
.then(['"$selector" has the "$class" class'], function(selector, cls) {
|
|
// because `find` doesn't work, guessing its sandboxed to ember's container
|
|
assert
|
|
.dom(document.querySelector(selector))
|
|
.hasClass(cls, `Expected [class] to contain ${cls} on ${selector}`);
|
|
})
|
|
.then(['"$selector" doesn\'t have the "$class" class'], function(selector, cls) {
|
|
assert.ok(
|
|
!document.querySelector(selector).classList.contains(cls),
|
|
`Expected [class] not to contain ${cls} on ${selector}`
|
|
);
|
|
})
|
|
.then([`I${dont} see the "$selector" element`], function(negative, selector) {
|
|
assert[negative ? 'equal' : 'notEqual'](
|
|
document.querySelector(selector),
|
|
null,
|
|
`Expected${negative ? ' not' : ''} to see ${selector}`
|
|
);
|
|
})
|
|
// TODO: Make this accept a 'contains' word so you can search for text containing also
|
|
.then('I have settings like yaml\n$yaml', function(data) {
|
|
// TODO: Inject this
|
|
const settings = window.localStorage;
|
|
// TODO: this and the setup should probably use consul:
|
|
// as we are talking about 'settings' here not localStorage
|
|
// so the prefix should be hidden
|
|
Object.keys(data).forEach(function(prop) {
|
|
const actual = settings.getItem(prop);
|
|
const expected = data[prop];
|
|
assert.strictEqual(actual, expected, `Expected settings to be ${expected} was ${actual}`);
|
|
});
|
|
})
|
|
.then('the url should be $url', function(url) {
|
|
// TODO: nice! $url should be wrapped in ""
|
|
if (url === "''") {
|
|
url = '';
|
|
}
|
|
const current = currentURL() || '';
|
|
assert.equal(current, url, `Expected the url to be ${url} was ${current}`);
|
|
})
|
|
.then(['the title should be "$title"'], function(title) {
|
|
assert.equal(document.title, title, `Expected the document.title to equal "${title}"`);
|
|
});
|
|
}
|