Commit 835795f9 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch...

Merge branch '239870-convert-stylesheets-pages-serverless-scss-into-page-specific-bundle' into 'master'

Remove stylesheets/pages/serverless.scss in favor of utility classes

See merge request gitlab-org/gitlab!44400
parents ef2ab963 b9300fbd
...@@ -16,7 +16,9 @@ export default { ...@@ -16,7 +16,9 @@ export default {
<template> <template>
<div class="clipboard-group"> <div class="clipboard-group">
<div class="url-text-field label label-monospace monospace">{{ uri }}</div> <div class="gl-cursor-text label label-monospace monospace" data-testid="url-text-field">
{{ uri }}
</div>
<clipboard-button <clipboard-button
:text="uri" :text="uri"
:title="s__('ServerlessURL|Copy URL')" :title="s__('ServerlessURL|Copy URL')"
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
@import './pages/reports'; @import './pages/reports';
@import './pages/runners'; @import './pages/runners';
@import './pages/search'; @import './pages/search';
@import './pages/serverless';
@import './pages/service_desk'; @import './pages/service_desk';
@import './pages/settings'; @import './pages/settings';
@import './pages/settings_ci_cd'; @import './pages/settings_ci_cd';
......
...@@ -19,7 +19,7 @@ describe('urlComponent', () => { ...@@ -19,7 +19,7 @@ describe('urlComponent', () => {
expect(vm.$el.classList.contains('clipboard-group')).toBe(true); expect(vm.$el.classList.contains('clipboard-group')).toBe(true);
expect(wrapper.find(ClipboardButton).attributes('text')).toEqual(uri); expect(wrapper.find(ClipboardButton).attributes('text')).toEqual(uri);
expect(vm.$el.querySelector('.url-text-field').innerHTML).toEqual(uri); expect(vm.$el.querySelector('[data-testid="url-text-field"]').innerHTML).toContain(uri);
vm.$destroy(); vm.$destroy();
}); });
......
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