diff --git a/__tests__/App.test.jsx b/__tests__/App.test.jsx index 58c8d57056..e07a1984d5 100644 --- a/__tests__/App.test.jsx +++ b/__tests__/App.test.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { shallow, mount } from 'enzyme'; import App from '../src/App'; import api from '../src/api'; -import * as constant from '../src/endpoints'; +import { API_LOGOUT } from '../src/endpoints'; import Dashboard from '../src/pages/Dashboard'; import Login from '../src/pages/Login'; @@ -66,13 +66,13 @@ describe('', () => { }); test('api.logout called from logout button', async () => { - api.BaseGet = jest.fn().mockImplementation(() => Promise.resolve({})); + api.get = jest.fn().mockImplementation(() => Promise.resolve({})); const appWrapper = mount(); const logoutButton = appWrapper.find('LogoutButton'); logoutButton.props().onDevLogout(); appWrapper.setState({ activeGroup: 'foo', activeItem: 'bar' }); - expect(api.BaseGet).toHaveBeenCalledTimes(1); - expect(api.BaseGet).toHaveBeenCalledWith(constant.API_LOGOUT); + expect(api.get).toHaveBeenCalledTimes(1); + expect(api.get).toHaveBeenCalledWith(API_LOGOUT); await asyncFlush(); expect(appWrapper.state().activeItem).toBe(DEFAULT_ACTIVE_ITEM); expect(appWrapper.state().activeGroup).toBe(DEFAULT_ACTIVE_GROUP); diff --git a/__tests__/api.test.js b/__tests__/api.test.js index f4aa913153..9bc5a7f218 100644 --- a/__tests__/api.test.js +++ b/__tests__/api.test.js @@ -1,7 +1,7 @@ import mockAxios from 'axios'; import APIClient from '../src/api'; -import * as constant from '../src/endpoints'; +import * as endpoints from '../src/endpoints'; const CSRF_COOKIE_NAME = 'csrftoken'; const CSRF_HEADER_NAME = 'X-CSRFToken'; @@ -45,9 +45,9 @@ describe('APIClient (api.js)', () => { APIClient.setCookie = jest.fn(); APIClient.login(un, pw, next).then(() => { expect(mockAxios.get).toHaveBeenCalledTimes(1); - expect(mockAxios.get).toHaveBeenCalledWith(constant.API_LOGIN, { headers }); + expect(mockAxios.get).toHaveBeenCalledWith(endpoints.API_LOGIN, { headers }); expect(mockAxios.post).toHaveBeenCalledTimes(1); - expect(mockAxios.post).toHaveBeenCalledWith(constant.API_LOGIN, data, { headers }); + expect(mockAxios.post).toHaveBeenCalledWith(endpoints.API_LOGIN, data, { headers }); done(); }); }); @@ -60,7 +60,7 @@ describe('APIClient (api.js)', () => { const data = `username=${encodeURIComponent(un)}&password=${encodeURIComponent(pw)}&next=${encodeURIComponent(next)}`; APIClient.login(un, pw, next).then(() => { expect(mockAxios.post).toHaveBeenCalledTimes(1); - expect(mockAxios.post).toHaveBeenCalledWith(constant.API_LOGIN, data, { headers }); + expect(mockAxios.post).toHaveBeenCalledWith(endpoints.API_LOGIN, data, { headers }); done(); }); }); @@ -69,11 +69,11 @@ describe('APIClient (api.js)', () => { const un = 'foo'; const pw = 'bar'; const headers = { 'Content-Type': LOGIN_CONTENT_TYPE }; - const data = `username=${un}&password=${pw}&next=${encodeURIComponent(constant.API_CONFIG)}`; + const data = `username=${un}&password=${pw}&next=${encodeURIComponent(endpoints.API_CONFIG)}`; APIClient.setCookie = jest.fn(); APIClient.login(un, pw).then(() => { expect(mockAxios.post).toHaveBeenCalledTimes(1); - expect(mockAxios.post).toHaveBeenCalledWith(constant.API_LOGIN, data, { headers }); + expect(mockAxios.post).toHaveBeenCalledWith(endpoints.API_LOGIN, data, { headers }); done(); }); }); diff --git a/src/App.jsx b/src/App.jsx index 26cf0724b2..98adc2d5c4 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -81,7 +81,7 @@ class App extends React.Component { } onDevLogout = async () => { - await api.BaseGet(API_LOGOUT); + await api.get(API_LOGOUT); this.setState({ activeGroup: 'views_group', activeItem: 'views_group_dashboard' }); } diff --git a/src/api.js b/src/api.js index 0b0513cc85..8063b24c19 100644 --- a/src/api.js +++ b/src/api.js @@ -1,6 +1,6 @@ import axios from 'axios'; -import * as constant from './endpoints'; +import * as endpoints from './endpoints'; const CSRF_COOKIE_NAME = 'csrftoken'; const CSRF_HEADER_NAME = 'X-CSRFToken'; @@ -32,7 +32,7 @@ class APIClient { return authenticated; } - async login (username, password, redirect = constant.API_CONFIG) { + async login (username, password, redirect = endpoints.API_CONFIG) { const un = encodeURIComponent(username); const pw = encodeURIComponent(password); const next = encodeURIComponent(redirect); @@ -40,11 +40,11 @@ class APIClient { const data = `username=${un}&password=${pw}&next=${next}`; const headers = { 'Content-Type': LOGIN_CONTENT_TYPE }; - await this.http.get(constant.API_LOGIN, { headers }); - await this.http.post(constant.API_LOGIN, data, { headers }); + await this.http.get(endpoints.API_LOGIN, { headers }); + await this.http.post(endpoints.API_LOGIN, data, { headers }); } - BaseGet = (endpoint) => this.http.get(endpoint); + get = (endpoint) => this.http.get(endpoint); } diff --git a/src/index.jsx b/src/index.jsx index f5d675b04f..d20574471f 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -13,7 +13,7 @@ import './app.scss'; const el = document.getElementById('app'); const main = async () => { - const { custom_logo, custom_login_info } = await api.BaseGet(API_ROOT); + const { custom_logo, custom_login_info } = await api.get(API_ROOT); render(, el); }; diff --git a/src/pages/Organizations.jsx b/src/pages/Organizations.jsx index 99cad1650d..84708f91a8 100644 --- a/src/pages/Organizations.jsx +++ b/src/pages/Organizations.jsx @@ -19,7 +19,7 @@ class Organizations extends Component { } async componentDidMount () { - const { data } = await api.BaseGet(API_ORGANIZATIONS); + const { data } = await api.get(API_ORGANIZATIONS); this.setState({ organizations: data.results }); }