{searchResults?.nbHits === 0 && (
-
+
+
+
+
+
+
)}
{searchResults?.nbHits !== 0 && (
{PAGINATE_ME}
;
-const csvData = [{ csv_data: 'foobar' }];
-jest
- .spyOn(EnterpriseCatalogApiService, 'fetchDefaultCoursesInCatalogWithFacets')
- .mockResolvedValue(csvData);
+// all we are testing is routes, we don't need InstantSearch to work here
+jest.mock('react-instantsearch-dom', () => ({
+ ...jest.requireActual('react-instantsearch-dom'),
+ InstantSearch: () => Popular Courses
,
+ Index: () => Popular Courses
,
+}));
const DEFAULT_SEARCH_CONTEXT_VALUE = { refinements: {} };
@@ -523,23 +524,8 @@ describe('Main Catalogs view works as expected', () => {
),
).toBeInTheDocument();
});
- test('no program search results displays popular programs text', async () => {
- const emptySearchResults = { ...searchResults, nbHits: 0 };
- renderWithRouter(
-
-
-
-
- ,
- );
- expect(screen.getByTestId('noResultsAlertTestId')).toBeInTheDocument();
- await act(() => screen.findByText('Popular Programs'));
- expect(screen.getByText('Popular Programs')).toBeInTheDocument();
- });
- test('no course search results displays popular programs text', async () => {
+
+ test('no course search results displays popular course text', async () => {
const emptySearchResults = { ...searchResults, nbHits: 0 };
renderWithRouter(
@@ -551,7 +537,6 @@ describe('Main Catalogs view works as expected', () => {
,
);
- expect(screen.getByTestId('noResultsAlertTestId')).toBeInTheDocument();
await act(() => screen.findByText('Popular Courses'));
expect(screen.getByText('Popular Courses')).toBeInTheDocument();
});
diff --git a/src/components/catalogSearchResults/associatedComponents/downloadCsvButton/DownloadCsvButton.test.jsx b/src/components/catalogSearchResults/associatedComponents/downloadCsvButton/DownloadCsvButton.test.jsx
index b3932489..ec72de8f 100644
--- a/src/components/catalogSearchResults/associatedComponents/downloadCsvButton/DownloadCsvButton.test.jsx
+++ b/src/components/catalogSearchResults/associatedComponents/downloadCsvButton/DownloadCsvButton.test.jsx
@@ -62,9 +62,7 @@ describe('Download button', () => {
const input = screen.getByText('Download results');
userEvent.click(input);
});
- // The query, query param should not have an `&` in it.
- // TODO: figure out why the process env for catalog base service can't be set in the test
- const expectedWindowLocation = 'undefined/api/v1/enterprise-catalogs/catalog_workbook?availability=Available'
+ const expectedWindowLocation = `${process.env.CATALOG_SERVICE_BASE_URL}/api/v1/enterprise-catalogs/catalog_workbook?availability=Available`
+ '+Now&availability=Upcoming&query=math%20%26%20science';
expect(window.location.href).toEqual(expectedWindowLocation);
});
diff --git a/src/data/services/EnterpriseCatalogAPIService.js b/src/data/services/EnterpriseCatalogAPIService.js
index 6ffa5898..e053060b 100644
--- a/src/data/services/EnterpriseCatalogAPIService.js
+++ b/src/data/services/EnterpriseCatalogAPIService.js
@@ -1,11 +1,8 @@
-import { getHttpClient } from '@edx/frontend-platform/auth';
import { createQueryParams } from '../../utils/catalogUtils';
class EnterpriseCatalogApiService {
static enterpriseCatalogServiceApiUrl = `${process.env.CATALOG_SERVICE_BASE_URL}/api/v1/enterprise-catalogs`;
- static apiClient = getHttpClient;
-
static generateCsvDownloadLink(options, query) {
const facetQuery = query ? `&query=${encodeURIComponent(query)}` : '';
const queryParams = createQueryParams(options);
@@ -14,21 +11,6 @@ class EnterpriseCatalogApiService {
}/catalog_workbook?${queryParams}${facetQuery}`;
return enterpriseListUrl;
}
-
- static fetchDefaultCoursesInCatalog(options) {
- const queryParams = new URLSearchParams(options);
- const enterpriseListUrl = `${
- EnterpriseCatalogApiService.enterpriseCatalogServiceApiUrl
- }/default_course_set?${queryParams.toString()}`;
- return EnterpriseCatalogApiService.apiClient().get(enterpriseListUrl);
- }
-
- static fetchDefaultCoursesInCatalogWithFacets(facets) {
- return this.fetchDefaultCoursesInCatalog(facets).then((response) => {
- const { data } = response;
- return data;
- });
- }
}
export default EnterpriseCatalogApiService;
diff --git a/src/data/services/EnterpriseCatalogAPIService.test.js b/src/data/services/EnterpriseCatalogAPIService.test.js
index 76f21259..31f8e974 100644
--- a/src/data/services/EnterpriseCatalogAPIService.test.js
+++ b/src/data/services/EnterpriseCatalogAPIService.test.js
@@ -1,30 +1,17 @@
import '@testing-library/jest-dom/extend-expect';
-import { getHttpClient } from '@edx/frontend-platform/auth';
import EnterpriseCatalogApiService from './EnterpriseCatalogAPIService';
-jest.mock('@edx/frontend-platform/auth');
-
-const mockApiClient = {
- get: jest.fn().mockResolvedValue({ value: 'foobar' }),
-};
-getHttpClient.mockReturnValue(mockApiClient);
-
-const mockDefaultCourses = jest.spyOn(
- EnterpriseCatalogApiService,
- 'fetchDefaultCoursesInCatalog',
-);
-
-describe('fetchDefaultCoursesInCatalogWithFacets', () => {
- afterEach(() => {
- jest.clearAllMocks();
- });
- it('requests the catalog API with fetchDefaultCoursesInCatalog', () => {
- const facets = { content_type: 'course' };
- EnterpriseCatalogApiService.fetchDefaultCoursesInCatalogWithFacets(facets);
- expect(mockDefaultCourses).toBeCalledWith(facets);
- // An issue with process.env is making it impossible to assert the value the method is called with
- // So for now simply assert the method's been called
- expect(mockApiClient.get).toBeCalled();
+describe('generateCsvDownloadLink', () => {
+ test('correctly formats csv download link', () => {
+ const options = { enterprise_catalog_query_titles: 'test' };
+ const query = 'somequery';
+ const generatedDownloadLink = EnterpriseCatalogApiService.generateCsvDownloadLink(
+ options,
+ query,
+ );
+ expect(generatedDownloadLink).toEqual(
+ `${process.env.CATALOG_SERVICE_BASE_URL}/api/v1/enterprise-catalogs/catalog_workbook?enterprise_catalog_query_titles=test&query=${query}`,
+ );
});
});