diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-03 08:05:52 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-03 08:05:52 +0000 |
commit | a374d690e702f26036f38bf375ceb2a5cfa3fe23 (patch) | |
tree | 09a9e81a05404c905af37d2df87a000908ad4313 /spec/javascripts | |
parent | 16a935f28f5d9a69d0cd310d1ef035d82ee4b575 (diff) | |
parent | eebf24ead51a28863126f0b144e4fcdc5a6b2916 (diff) | |
download | gitlab-ce-a374d690e702f26036f38bf375ceb2a5cfa3fe23.tar.gz |
Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'
Fixes duplicate diff too large error messages
Closes #59802
See merge request gitlab-org/gitlab-ce!26857
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/diffs/components/diff_file_spec.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js index d9b298e84da..ef4589ada48 100644 --- a/spec/javascripts/diffs/components/diff_file_spec.js +++ b/spec/javascripts/diffs/components/diff_file_spec.js @@ -141,18 +141,16 @@ describe('DiffFile', () => { it('should have too large warning and blob link', done => { const BLOB_LINK = '/file/view/path'; vm.file.viewer.error = diffViewerErrors.too_large; + vm.file.viewer.error_message = + 'This source diff could not be displayed because it is too large'; vm.file.view_path = BLOB_LINK; + vm.file.renderIt = true; vm.$nextTick(() => { expect(vm.$el.innerText).toContain( 'This source diff could not be displayed because it is too large', ); - expect(vm.$el.querySelector('.js-too-large-diff')).toBeDefined(); - expect( - vm.$el.querySelector('.js-too-large-diff a').href.indexOf(BLOB_LINK), - ).toBeGreaterThan(-1); - done(); }); }); |