Commit 3406b5d7 authored by Sean McGivern's avatar Sean McGivern

Merge branch...

Merge branch '332563-rename-usagepingcontroller-to-servicepingcontroller-and-refactor-fix-specs-2' into 'master'

Change frontend URLs to point to `service_ping`

See merge request gitlab-org/gitlab!64449
parents 217abc22 7606825f
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
return Api.commitPipelines(getters.currentProject.path_with_namespace, commitSha); return Api.commitPipelines(getters.currentProject.path_with_namespace, commitSha);
}, },
pingUsage(projectPath) { pingUsage(projectPath) {
const url = `${gon.relative_url_root}/${projectPath}/usage_ping/web_ide_pipelines_count`; const url = `${gon.relative_url_root}/${projectPath}/service_ping/web_ide_pipelines_count`;
return axios.post(url); return axios.post(url);
}, },
getCiConfig(projectPath, content) { getCiConfig(projectPath, content) {
......
...@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils'; ...@@ -3,7 +3,7 @@ import axios from '~/lib/utils/axios_utils';
export const pingUsage = ({ rootGetters }) => { export const pingUsage = ({ rootGetters }) => {
const { web_url: projectUrl } = rootGetters.currentProject; const { web_url: projectUrl } = rootGetters.currentProject;
const url = `${projectUrl}/usage_ping/web_ide_clientside_preview`; const url = `${projectUrl}/service_ping/web_ide_clientside_preview`;
return axios.post(url); return axios.post(url);
}; };
......
...@@ -292,7 +292,7 @@ describe('IDE services', () => { ...@@ -292,7 +292,7 @@ describe('IDE services', () => {
it('posts to usage endpoint', () => { it('posts to usage endpoint', () => {
const TEST_PROJECT_PATH = 'foo/bar'; const TEST_PROJECT_PATH = 'foo/bar';
const axiosURL = `${TEST_RELATIVE_URL_ROOT}/${TEST_PROJECT_PATH}/usage_ping/web_ide_pipelines_count`; const axiosURL = `${TEST_RELATIVE_URL_ROOT}/${TEST_PROJECT_PATH}/service_ping/web_ide_pipelines_count`;
mock.onPost(axiosURL).reply(200); mock.onPost(axiosURL).reply(200);
......
...@@ -5,7 +5,7 @@ import * as actions from '~/ide/stores/modules/clientside/actions'; ...@@ -5,7 +5,7 @@ import * as actions from '~/ide/stores/modules/clientside/actions';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
const TEST_PROJECT_URL = `${TEST_HOST}/lorem/ipsum`; const TEST_PROJECT_URL = `${TEST_HOST}/lorem/ipsum`;
const TEST_USAGE_URL = `${TEST_PROJECT_URL}/usage_ping/web_ide_clientside_preview`; const TEST_USAGE_URL = `${TEST_PROJECT_URL}/service_ping/web_ide_clientside_preview`;
describe('IDE store module clientside actions', () => { describe('IDE store module clientside actions', () => {
let rootGetters; let rootGetters;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment