diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
commit | 0efbc126d080892214d312a3ae2549f1fc341cb6 (patch) | |
tree | b7131288bcbc3c5b0160ad55ed4b95523ce71c12 /spec/javascripts/badges/components/badge_list_spec.js | |
parent | 46e3ad4b948dedf67245708493ee17c4429f8bf3 (diff) | |
parent | 679c0048a8f679aad456c02e30486150bbd0d93d (diff) | |
download | gitlab-ce-0efbc126d080892214d312a3ae2549f1fc341cb6.tar.gz |
Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
Diffstat (limited to 'spec/javascripts/badges/components/badge_list_spec.js')
-rw-r--r-- | spec/javascripts/badges/components/badge_list_spec.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/javascripts/badges/components/badge_list_spec.js b/spec/javascripts/badges/components/badge_list_spec.js index 02e59ae0843..536671db377 100644 --- a/spec/javascripts/badges/components/badge_list_spec.js +++ b/spec/javascripts/badges/components/badge_list_spec.js @@ -34,11 +34,13 @@ describe('BadgeList component', () => { it('renders a header with the badge count', () => { const header = vm.$el.querySelector('.card-header'); + expect(header).toHaveText(new RegExp(`Your badges\\s+${numberOfDummyBadges}`)); }); it('renders a row for each badge', () => { const rows = vm.$el.querySelectorAll('.gl-responsive-table-row'); + expect(rows).toHaveLength(numberOfDummyBadges); }); @@ -59,6 +61,7 @@ describe('BadgeList component', () => { Vue.nextTick() .then(() => { const loadingIcon = vm.$el.querySelector('.fa-spinner'); + expect(loadingIcon).toBeVisible(); }) .then(done) |