Commit 6b657e23 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch...

Merge branch '351690-replace-secondary-with-tertiary-variant-button-variant-on-install-a-new-agent-modal' into 'master'

Resolve "Replace secondary with tertiary variant button variant on install a new Agent modal"

See merge request gitlab-org/gitlab!79664
parents 18c74afe 3e1d9e70
...@@ -408,8 +408,6 @@ export default { ...@@ -408,8 +408,6 @@ export default {
<gl-button <gl-button
v-if="isEmptyStateModal" v-if="isEmptyStateModal"
variant="confirm"
category="secondary"
:data-track-action="$options.EVENT_ACTIONS_CLICK" :data-track-action="$options.EVENT_ACTIONS_CLICK"
:data-track-label="$options.EVENT_LABEL_MODAL" :data-track-label="$options.EVENT_LABEL_MODAL"
data-track-property="done" data-track-property="done"
......
...@@ -309,12 +309,13 @@ describe('InstallAgentModal', () => { ...@@ -309,12 +309,13 @@ describe('InstallAgentModal', () => {
describe('when KAS is disabled', () => { describe('when KAS is disabled', () => {
const i18n = I18N_AGENT_MODAL.empty_state; const i18n = I18N_AGENT_MODAL.empty_state;
beforeEach(() => { beforeEach(async () => {
apolloProvider = createMockApollo([ apolloProvider = createMockApollo([
[getAgentConfigurations, jest.fn().mockResolvedValue(kasDisabledErrorResponse)], [getAgentConfigurations, jest.fn().mockResolvedValue(kasDisabledErrorResponse)],
]); ]);
return mockSelectedAgentResponse(); createWrapper();
await waitForPromises();
}); });
it('renders empty state image', () => { it('renders empty state image', () => {
...@@ -328,8 +329,8 @@ describe('InstallAgentModal', () => { ...@@ -328,8 +329,8 @@ describe('InstallAgentModal', () => {
}); });
it('renders a cancel button', () => { it('renders a cancel button', () => {
expect(findActionButton().isVisible()).toBe(true); expect(findCancelButton().isVisible()).toBe(true);
expect(findActionButton().text()).toBe(i18n.done); expect(findCancelButton().text()).toBe(i18n.done);
}); });
it("doesn't render a secondary button", () => { it("doesn't render a secondary button", () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment