Add latest changes from gitlab-org/gitlab@master

1 files changed, 29 insertions, 0 deletions

diff --git a/spec/frontend/helpers/help_page_helper_spec.js b/spec/frontend/helpers/help_page_helper_spec.js
new file mode 100644
index 00000000000..09c1a113a96
--- /dev/null
+++ b/spec/frontend/helpers/help_page_helper_spec.js
@@ -0,0 +1,29 @@
+import { helpPagePath } from '~/helpers/help_page_helper';
+
+describe('help page helper', () => {
+  it.each`
+    relative_url_root | path                         | anchor                  | expected
+    ${undefined}      | ${'administration/index'}    | ${undefined}            | ${'/help/administration/index'}
+    ${''}             | ${'administration/index'}    | ${undefined}            | ${'/help/administration/index'}
+    ${'/'}            | ${'administration/index'}    | ${undefined}            | ${'/help/administration/index'}
+    ${'/gitlab'}      | ${'administration/index'}    | ${undefined}            | ${'/gitlab/help/administration/index'}
+    ${'/gitlab/'}     | ${'administration/index'}    | ${undefined}            | ${'/gitlab/help/administration/index'}
+    ${undefined}      | ${'administration/index'}    | ${undefined}            | ${'/help/administration/index'}
+    ${'/'}            | ${'administration/index'}    | ${undefined}            | ${'/help/administration/index'}
+    ${''}             | ${'administration/index.md'} | ${undefined}            | ${'/help/administration/index.md'}
+    ${''}             | ${'administration/index.md'} | ${'installing-gitlab'}  | ${'/help/administration/index.md#installing-gitlab'}
+    ${''}             | ${'administration/index'}    | ${'installing-gitlab'}  | ${'/help/administration/index#installing-gitlab'}
+    ${''}             | ${'administration/index'}    | ${'#installing-gitlab'} | ${'/help/administration/index#installing-gitlab'}
+    ${''}             | ${'/administration/index'}   | ${undefined}            | ${'/help/administration/index'}
+    ${''}             | ${'administration/index/'}   | ${undefined}            | ${'/help/administration/index/'}
+    ${''}             | ${'/administration/index/'}  | ${undefined}            | ${'/help/administration/index/'}
+    ${'/'}            | ${'/administration/index'}   | ${undefined}            | ${'/help/administration/index'}
+  `(
+    'generates correct URL when path is `$path`, relative url is `$relative_url_root` and anchor is `$anchor`',
+    ({ relative_url_root, anchor, path, expected }) => {
+      window.gon = { relative_url_root };
+
+      expect(helpPagePath(path, { anchor })).toBe(expected);
+    },
+  );
+});