summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-17 09:02:17 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-04-17 09:02:17 +0000
commit9ba30fc55d82a24ac5e07459a39e937fa3966d86 (patch)
tree4dfd25bc7d0b7f7bc6de8b82e29804516917e6c9 /spec/javascripts
parent4d78cacc83df59318867f021e4b168453ef49fc3 (diff)
parentee7d2298e5560539815df6c7b982bc3182aea198 (diff)
downloadgitlab-ce-9ba30fc55d82a24ac5e07459a39e937fa3966d86.tar.gz
Merge branch '10083-dropdown-ce-ee-difference' into 'master'
Removes EE diffs for dropdown_value_collapsed.vue Closes gitlab-ee#10083 See merge request gitlab-org/gitlab-ce!27367
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js b/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
index cb49fa31d20..4d3de5e474d 100644
--- a/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
+++ b/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
@@ -27,10 +27,10 @@ describe('DropdownValueCollapsedComponent', () => {
describe('computed', () => {
describe('labelsList', () => {
- it('returns empty text when `labels` prop is empty array', () => {
+ it('returns default text when `labels` prop is empty array', () => {
const vmEmptyLabels = createComponent([]);
- expect(vmEmptyLabels.labelsList).toBe('');
+ expect(vmEmptyLabels.labelsList).toBe('Labels');
vmEmptyLabels.$destroy();
});