diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
commit | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch) | |
tree | fd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /spec/frontend/repository | |
parent | 5564275a0b378298dc6281599cbfe71a937109ff (diff) | |
download | gitlab-ce-0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/repository')
3 files changed, 31 insertions, 3 deletions
diff --git a/spec/frontend/repository/components/breadcrumbs_spec.js b/spec/frontend/repository/components/breadcrumbs_spec.js index bc2abb3db1a..0271db25468 100644 --- a/spec/frontend/repository/components/breadcrumbs_spec.js +++ b/spec/frontend/repository/components/breadcrumbs_spec.js @@ -33,6 +33,17 @@ describe('Repository breadcrumbs component', () => { expect(vm.findAll(RouterLinkStub).length).toEqual(linkCount); }); + it('escapes hash in directory path', () => { + factory('app/assets/javascripts#'); + + expect( + vm + .findAll(RouterLinkStub) + .at(3) + .props('to'), + ).toEqual('/-/tree//app/assets/javascripts%23'); + }); + it('renders last link as active', () => { factory('app/assets'); diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js index 360c2e97353..904798e0b83 100644 --- a/spec/frontend/repository/components/table/parent_row_spec.js +++ b/spec/frontend/repository/components/table/parent_row_spec.js @@ -31,9 +31,10 @@ describe('Repository parent row component', () => { }); it.each` - path | to - ${'app'} | ${'/-/tree/master/'} - ${'app/assets'} | ${'/-/tree/master/app'} + path | to + ${'app'} | ${'/-/tree/master/'} + ${'app/assets'} | ${'/-/tree/master/app'} + ${'app/assets#/test'} | ${'/-/tree/master/app/assets%23'} `('renders link in $path to $to', ({ path, to }) => { factory(path); diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js index b0c97dee414..71709e7dd83 100644 --- a/spec/frontend/repository/components/table/row_spec.js +++ b/spec/frontend/repository/components/table/row_spec.js @@ -95,6 +95,22 @@ describe('Repository table row component', () => { }); }); + it('pushes new route for directory with hash', () => { + factory({ + id: '1', + sha: '123', + path: 'test#', + type: 'tree', + currentPath: '/', + }); + + return vm.vm.$nextTick().then(() => { + vm.trigger('click'); + + expect($router.push).toHaveBeenCalledWith({ path: '/-/tree/master/test%23' }); + }); + }); + it.each` type | pushes ${'tree'} | ${true} |