Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 10 deletions

diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js
index 439c7ff080c..360c2e97353 100644
--- a/spec/frontend/repository/components/table/parent_row_spec.js
+++ b/spec/frontend/repository/components/table/parent_row_spec.js
@@ -32,8 +32,8 @@ describe('Repository parent row component', () => {
 
   it.each`
     path            | to
-    ${'app'}        | ${'/tree/master/'}
-    ${'app/assets'} | ${'/tree/master/app'}
+    ${'app'}        | ${'/-/tree/master/'}
+    ${'app/assets'} | ${'/-/tree/master/app'}
   `('renders link in $path to $to', ({ path, to }) => {
     factory(path);
 
@@ -48,7 +48,7 @@ describe('Repository parent row component', () => {
     vm.find('td').trigger('click');
 
     expect($router.push).toHaveBeenCalledWith({
-      path: '/tree/master/app',
+      path: '/-/tree/master/app',
     });
   });
 
@@ -60,7 +60,7 @@ describe('Repository parent row component', () => {
     vm.find('a').trigger('click');
 
     expect($router.push).not.toHaveBeenCalledWith({
-      path: '/tree/master/app',
+      path: '/-/tree/master/app',
     });
   });
 
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index b60560366a6..b0c97dee414 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -88,7 +88,7 @@ describe('Repository table row component', () => {
       vm.trigger('click');
 
       if (pushes) {
-        expect($router.push).toHaveBeenCalledWith({ path: '/tree/master/test' });
+        expect($router.push).toHaveBeenCalledWith({ path: '/-/tree/master/test' });
       } else {
         expect($router.push).not.toHaveBeenCalled();
       }
diff --git a/spec/frontend/repository/router_spec.js b/spec/frontend/repository/router_spec.js
index f61a0ccd1e6..1efd74a30c2 100644
--- a/spec/frontend/repository/router_spec.js
+++ b/spec/frontend/repository/router_spec.js
@@ -4,11 +4,11 @@ import createRouter from '~/repository/router';
 
 describe('Repository router spec', () => {
   it.each`
-    path                         | component    | componentName
-    ${'/'}                       | ${IndexPage} | ${'IndexPage'}
-    ${'/tree/master'}            | ${TreePage}  | ${'TreePage'}
-    ${'/tree/master/app/assets'} | ${TreePage}  | ${'TreePage'}
-    ${'/tree/123/app/assets'}    | ${null}      | ${'null'}
+    path                           | component    | componentName
+    ${'/'}                         | ${IndexPage} | ${'IndexPage'}
+    ${'/-/tree/master'}            | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/master/app/assets'} | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/123/app/assets'}    | ${null}      | ${'null'}
   `('sets component as $componentName for path "$path"', ({ path, component }) => {
     const router = createRouter('', 'master');