Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ui json edit test #5705

Merged
merged 4 commits into from
Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ui/app/templates/components/secret-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
@params={{array targetRoute model.id (query-params version=this.modelForData.version)}}
@replace={{true}}
class="link link-plain has-text-weight-semibold"
data-test-secret-edit="true"
>
Create new version
</LinkTo>
Expand All @@ -68,6 +69,7 @@
@params={{array targetRoute model.id}}
@replace={{true}}
class="link link-plain has-text-weight-semibold"
data-test-secret-edit="true"
>
Edit Secret
</LinkTo>
Expand Down
18 changes: 18 additions & 0 deletions ui/tests/acceptance/secrets/backend/kv/secret-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,22 @@ module('Acceptance | secrets/secret/create', function(hooks) {
assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list');
assert.ok(currentURL().endsWith('/'), 'redirects to the path ending in a slash');
});

test('it can edit via the JSON input', async function(assert) {
let content = JSON.stringify({ foo: 'fa', bar: 'boo' });
const path = `kv-path-${new Date().getTime()}`;
await listPage.visitRoot({ backend: 'secret' });
await listPage.create();
await editPage.path(path).toggleJSON();
await editPage.editor.fillIn(this, content);
await editPage.save();

assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.show', 'redirects to the show page');
assert.ok(showPage.editIsPresent, 'shows the edit button');
assert.equal(
showPage.editor.content(this),
JSON.stringify({ bar: 'boo', foo: 'fa' }, null, 2),
'saves the content'
);
});
});
15 changes: 15 additions & 0 deletions ui/tests/helpers/codemirror.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const invariant = (truthy, error) => {
if (!truthy) throw new Error(error);
};

export default function(context, selector) {
let cmService = context.owner.lookup('service:code-mirror');

let element = document.querySelector(selector);
invariant(element, `Selector ${selector} matched no elements`);

let cm = cmService.instanceFor(element.id);
invariant(cm, `No registered CodeMirror instance for ${selector}`);

return cm;
}
34 changes: 34 additions & 0 deletions ui/tests/pages/helpers/codemirror.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import getCodeMirrorInstance from 'vault/tests/helpers/codemirror';
// Like fillable, but for the CodeMirror editor
//
// Usage: fillIn: codeFillable('[data-test-editor]')
// Page.fillIn(code);
export function codeFillable(selector) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

omg 💅

return {
isDescriptor: true,

get() {
return function(context, code) {
const cm = getCodeMirrorInstance(context, selector);
cm.setValue(code);
return this;
};
},
};
}

// Like text, but for the CodeMirror editor
//
// Usage: content: code('[data-test-editor]')
// Page.code(); // some = [ 'string', 'of', 'code' ]
export function code(selector) {
return {
isDescriptor: true,
get() {
return function(context) {
const cm = getCodeMirrorInstance(context, selector);
return cm.getValue();
};
},
};
}
6 changes: 5 additions & 1 deletion ui/tests/pages/secrets/backend/kv/edit-secret.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Base } from '../create';
import { clickable, visitable, create, fillable } from 'ember-cli-page-object';

import { codeFillable } from 'vault/tests/pages/helpers/codemirror';
export default create({
...Base,
path: fillable('[data-test-secret-path]'),
Expand All @@ -11,6 +11,10 @@ export default create({
confirmBtn: clickable('[data-test-confirm-button]'),
visitEdit: visitable('/vault/secrets/:backend/edit/:id'),
visitEditRoot: visitable('/vault/secrets/:backend/edit'),
toggleJSON: clickable('[data-test-secret-json-toggle]'),
editor: {
fillIn: codeFillable('[data-test-component="json-editor"]'),
},
deleteSecret() {
return this.deleteBtn().confirmBtn();
},
Expand Down
10 changes: 8 additions & 2 deletions ui/tests/pages/secrets/backend/kv/show.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import { Base } from '../show';
import { create, clickable, collection, isPresent } from 'ember-cli-page-object';
import { code } from 'vault/tests/pages/helpers/codemirror';

export default create({
...Base,
rows: collection('data-test-row-label'),
edit: clickable('[data-test-secret-json-toggle]'),
editIsPresent: isPresent('[data-test-secret-json-toggle]'),
toggleJSON: clickable('[data-test-secret-json-toggle]'),
toggleIsPresent: isPresent('[data-test-secret-json-toggle]'),
edit: clickable('[data-test-secret-edit]'),
editIsPresent: isPresent('[data-test-secret-edit]'),
editor: {
content: code('[data-test-component="json-editor"]'),
},
});