Merge branch '62088-search-back' into 'master'

Fixed back navigation for projects filter

Closes #62088

See merge request gitlab-org/gitlab-ce!30373

2 files changed, 84 insertions, 0 deletions

diff --git a/spec/frontend/filterable_list_spec.js b/spec/frontend/filterable_list_spec.js
new file mode 100644
index 00000000000..67d18611661
--- /dev/null
+++ b/spec/frontend/filterable_list_spec.js
@@ -0,0 +1,53 @@
+import FilterableList from '~/filterable_list';
+import { getJSONFixture, setHTMLFixture } from './helpers/fixtures';
+
+describe('FilterableList', () => {
+  let List;
+  let form;
+  let filter;
+  let holder;
+
+  beforeEach(() => {
+    setHTMLFixture(`
+      <form id="project-filter-form">
+        <input name="name" class="js-projects-list-filter" />
+      </div>
+      <div class="js-projects-list-holder"></div>
+    `);
+    getJSONFixture('static/projects.json');
+    form = document.querySelector('form#project-filter-form');
+    filter = document.querySelector('.js-projects-list-filter');
+    holder = document.querySelector('.js-projects-list-holder');
+    List = new FilterableList(form, filter, holder);
+  });
+
+  it('processes input parameters', () => {
+    expect(List.filterForm).toEqual(form);
+    expect(List.listFilterElement).toEqual(filter);
+    expect(List.listHolderElement).toEqual(holder);
+  });
+
+  describe('getPagePath', () => {
+    it('returns properly constructed base endpoint', () => {
+      List.filterForm.action = '/foo/bar/';
+      List.listFilterElement.value = 'blah';
+
+      expect(List.getPagePath()).toEqual('/foo/bar/?name=blah');
+    });
+
+    it('properly appends custom parameters to existing URL', () => {
+      List.filterForm.action = '/foo/bar?alpha=beta';
+      List.listFilterElement.value = 'blah';
+
+      expect(List.getPagePath()).toEqual('/foo/bar?alpha=beta&name=blah');
+    });
+  });
+
+  describe('getFilterEndpoint', () => {
+    it('returns getPagePath by default', () => {
+      jest.spyOn(List, 'getPagePath').mockReturnValue('blah/blah/foo');
+
+      expect(List.getFilterEndpoint()).toEqual(List.getPagePath());
+    });
+  });
+});
diff --git a/spec/frontend/projects/projects_filterable_list_spec.js b/spec/frontend/projects/projects_filterable_list_spec.js
new file mode 100644
index 00000000000..e756fb3ab56
--- /dev/null
+++ b/spec/frontend/projects/projects_filterable_list_spec.js
@@ -0,0 +1,31 @@
+import ProjectsFilterableList from '~/projects/projects_filterable_list';
+import { getJSONFixture, setHTMLFixture } from '../helpers/fixtures';
+
+describe('ProjectsFilterableList', () => {
+  let List;
+  let form;
+  let filter;
+  let holder;
+
+  beforeEach(() => {
+    setHTMLFixture(`
+      <form id="project-filter-form">
+        <input name="name" class="js-projects-list-filter" />
+      </div>
+      <div class="js-projects-list-holder"></div>
+    `);
+    getJSONFixture('static/projects.json');
+    form = document.querySelector('form#project-filter-form');
+    filter = document.querySelector('.js-projects-list-filter');
+    holder = document.querySelector('.js-projects-list-holder');
+    List = new ProjectsFilterableList(form, filter, holder);
+  });
+
+  describe('getFilterEndpoint', () => {
+    it('updates converts getPagePath for projects', () => {
+      jest.spyOn(List, 'getPagePath').mockReturnValue('blah/projects?');
+
+      expect(List.getFilterEndpoint()).toEqual('blah/projects.json?');
+    });
+  });
+});