diff options
author | Sean McGivern <sean@gitlab.com> | 2019-04-17 16:07:59 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-04-17 16:07:59 +0300 |
commit | 3f3d2c066188acbe0724dc5cc24f0d57456ef6d6 (patch) | |
tree | 83ec6cbf9bb06a6f2fe2d3bebed01b74691f530a /spec/javascripts | |
parent | 351827065a66294e35ec19dfa03470b2bb66ec5d (diff) | |
parent | fbb3fd1397c1304d424da404c226e4a4f9aa262b (diff) |
Merge branch 'sh-add-gitaly-backtrace' into 'master'
Add backtrace to Gitaly performance bar
Closes #60092
See merge request gitlab-org/gitlab-ce!27345
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/performance_bar/components/detailed_metric_spec.js | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/spec/javascripts/performance_bar/components/detailed_metric_spec.js b/spec/javascripts/performance_bar/components/detailed_metric_spec.js index e91685e50c5..8a7aa057186 100644 --- a/spec/javascripts/performance_bar/components/detailed_metric_spec.js +++ b/spec/javascripts/performance_bar/components/detailed_metric_spec.js @@ -27,8 +27,8 @@ describe('detailedMetric', () => { describe('when the current request has details', () => { const requestDetails = [ - { duration: '100', feature: 'find_commit', request: 'abcdef' }, - { duration: '23', feature: 'rebase_in_progress', request: '' }, + { duration: '100', feature: 'find_commit', request: 'abcdef', backtrace: ['hello', 'world'] }, + { duration: '23', feature: 'rebase_in_progress', request: '', backtrace: ['world', 'hello'] }, ]; beforeEach(() => { @@ -54,9 +54,11 @@ describe('detailedMetric', () => { }); it('adds a modal with a table of the details', () => { - vm.$el.querySelectorAll('.performance-bar-modal td strong').forEach((duration, index) => { - expect(duration.innerText).toContain(requestDetails[index].duration); - }); + vm.$el + .querySelectorAll('.performance-bar-modal td:nth-child(1)') + .forEach((duration, index) => { + expect(duration.innerText).toContain(requestDetails[index].duration); + }); vm.$el .querySelectorAll('.performance-bar-modal td:nth-child(2)') @@ -65,10 +67,16 @@ describe('detailedMetric', () => { }); vm.$el - .querySelectorAll('.performance-bar-modal td:nth-child(3)') + .querySelectorAll('.performance-bar-modal td:nth-child(2)') .forEach((request, index) => { - expect(request.innerText).toEqual(requestDetails[index].request); + expect(request.innerText).toContain(requestDetails[index].request); }); + + expect(vm.$el.querySelector('.text-expander.js-toggle-button')).not.toBeNull(); + + vm.$el.querySelectorAll('.performance-bar-modal td:nth-child(2)').forEach(request => { + expect(request.innerText).toContain('world'); + }); }); it('displays the metric name', () => { |