Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 26 deletions

diff --git a/spec/frontend/vue_shared/components/registry/__snapshots__/code_instruction_spec.js.snap b/spec/frontend/vue_shared/components/registry/__snapshots__/code_instruction_spec.js.snap
index e8d76991b90..eadcb6ceeb7 100644
--- a/spec/frontend/vue_shared/components/registry/__snapshots__/code_instruction_spec.js.snap
+++ b/spec/frontend/vue_shared/components/registry/__snapshots__/code_instruction_spec.js.snap
@@ -46,31 +46,15 @@ exports[`Package code instruction single line to match the default snapshot 1`]
         class="input-group-append"
         data-testid="instruction-button"
       >
-        <button
-          aria-label="Copy npm install command"
-          aria-live="polite"
-          class="btn input-group-text btn-default btn-md gl-button btn-default-secondary btn-icon"
-          data-clipboard-handle-tooltip="false"
-          data-clipboard-text="npm i @my-package"
-          id="clipboard-button-1"
+        <clipboard-button-stub
+          category="secondary"
+          class="input-group-text"
+          size="medium"
+          text="npm i @my-package"
           title="Copy npm install command"
-          type="button"
-        >
-          <!---->
-           
-          <svg
-            aria-hidden="true"
-            class="gl-button-icon gl-icon s16"
-            data-testid="copy-to-clipboard-icon"
-            role="img"
-          >
-            <use
-              href="#copy-to-clipboard"
-            />
-          </svg>
-            
-          <!---->
-        </button>
+          tooltipplacement="top"
+          variant="default"
+        />
       </span>
     </div>
   </div>
diff --git a/spec/frontend/vue_shared/components/registry/code_instruction_spec.js b/spec/frontend/vue_shared/components/registry/code_instruction_spec.js
index 60c1293b7c1..299535775e0 100644
--- a/spec/frontend/vue_shared/components/registry/code_instruction_spec.js
+++ b/spec/frontend/vue_shared/components/registry/code_instruction_spec.js
@@ -1,4 +1,4 @@
-import { mount } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
 import Tracking from '~/tracking';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue';
@@ -14,7 +14,7 @@ describe('Package code instruction', () => {
   };
 
   function createComponent(props = {}) {
-    wrapper = mount(CodeInstruction, {
+    wrapper = shallowMount(CodeInstruction, {
       propsData: {
         ...defaultProps,
         ...props,