diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-12 00:35:44 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-12 00:35:44 +0100 |
commit | 1e41440b0beb5803dd0e2bc901922ea362092119 (patch) | |
tree | aeb2195cd441bbd2fc95af8104d0e61ddc5af6cb | |
parent | e93214bce63518b31532d9406d00703aa2ef2d26 (diff) | |
download | gitlab-ce-1e41440b0beb5803dd0e2bc901922ea362092119.tar.gz |
Fix broken tests
3 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 538bb50d3c9..57391c3f148 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -12,7 +12,7 @@ notes_path: notes_url(view: 'full_data'), last_fetched_at: Time.now.to_i, issue_data: serialize_issuable(@issue), - current_user_data: UserSerializer.new.represent(current_user).to_json }} + current_user_data: UserSerializer.new.represent(current_user).to_json } } - content_for :page_specific_javascripts do = webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'notes' diff --git a/spec/javascripts/notes/components/issue_note_awards_list_spec.js b/spec/javascripts/notes/components/issue_note_awards_list_spec.js index d4156e29ba0..3b6c34f1494 100644 --- a/spec/javascripts/notes/components/issue_note_awards_list_spec.js +++ b/spec/javascripts/notes/components/issue_note_awards_list_spec.js @@ -39,7 +39,8 @@ describe('issue_note_awards_list component', () => { }); it('should render awarded emojis', () => { - expect(vm.$el.querySelectorAll('.js-awards-block button').length).toEqual(awardsMock.length); + expect(vm.$el.querySelector('.js-awards-block button [data-name="flag_tz"]')).toBeDefined(); + expect(vm.$el.querySelector('.js-awards-block button [data-name="cartwheel_tone3"]')).toBeDefined(); }); it('should be possible to remove awareded emoji', () => { diff --git a/spec/javascripts/notes/components/issue_note_body_spec.js b/spec/javascripts/notes/components/issue_note_body_spec.js index c0e06b0985b..81f07ed47cc 100644 --- a/spec/javascripts/notes/components/issue_note_body_spec.js +++ b/spec/javascripts/notes/components/issue_note_body_spec.js @@ -40,6 +40,7 @@ describe('issue_note_body component', () => { }); it('should render awards list', () => { - expect(vm.$el.querySelectorAll('.js-awards-block button').length).toEqual(note.award_emoji.length); + expect(vm.$el.querySelector('.js-awards-block button [data-name="baseball"]')).toBeDefined(); + expect(vm.$el.querySelector('.js-awards-block button [data-name="bath_tone3"]')).toBeDefined(); }); }); |