zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 15:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced all hard-coded api/v1 references with dynamic references or with v2

Browse Source
This commit is contained in:
Michael Abashian
2017-05-24 17:04:10 -04:00
parent aaf039c23d
commit b875fd65e1
36 changed files with 64 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/tests/spec/inventories/manage/inventory-manage.service-test.js
+1 -1
View File
@@ -20,7 +20,7 @@ describe('Service: InventoryManageService', () => {
spyOn(InventoryManageService, 'error');
});
it('InventoryManageService.getInventory should handle errors', () => {
Rest.expectGET('/api/v1/inventory:id/').respond(400, {});
Rest.expectGET('/api/v2/inventory:id/').respond(400, {});
Rest.flush();
expect(InventoryManageService.error).toHaveBeenCalled();
});
awx/ui/tests/spec/job-results/job-results.controller-test.js
+6 -6
View File
@@ -198,12 +198,12 @@ describe('Controller: jobResultsController', () => {
describe('getTowerLinks()', () => {
beforeEach(() => {
jobData.related = {
"created_by": "api/v1/users/12",
"inventory": "api/v1/inventories/12",
"project": "api/v1/projects/12",
"credential": "api/v1/credentials/12",
"cloud_credential": "api/v1/credentials/13",
"network_credential": "api/v1/credentials/14",
"created_by": "api/v2/users/12",
"inventory": "api/v2/inventories/12",
"project": "api/v2/projects/12",
"credential": "api/v2/credentials/12",
"cloud_credential": "api/v2/credentials/13",
"network_credential": "api/v2/credentials/14",
};
jobData.summary_fields.inventory = {
awx/ui/tests/spec/smart-search/queryset.service-test.js
+3 -3
View File
@@ -60,8 +60,8 @@ describe('Service: QuerySet', () => {
describe('fn search', () => {
let pattern = /\/api\/v1\/inventories\/(.+)\/groups\/*/,
endpoint = '/api/v1/inventories/1/groups/',
let pattern = /\/api\/v2\/inventories\/(.+)\/groups\/*/,
endpoint = '/api/v2/inventories/1/groups/',
params = {
or__name: 'borg',
or__description__icontains: 'assimilate'
@@ -72,7 +72,7 @@ describe('Service: QuerySet', () => {
.expectGET(pattern)
.respond(200, {});
QuerySet.search(endpoint, params).then((data) =>{
expect(data.config.url).toEqual('/api/v1/inventories/1/groups/?or__name=borg&or__description__icontains=assimilate');
expect(data.config.url).toEqual('/api/v2/inventories/1/groups/?or__name=borg&or__description__icontains=assimilate');
});
$httpBackend.flush();
});
awx/ui/tests/spec/workflow--results/data/workflow_job.js
+10 -10
View File
@@ -1,17 +1,17 @@
export default {
"id": 109,
"type": "workflow_job",
"url": "/api/v1/workflow_jobs/109/",
"url": "/api/v2/workflow_jobs/109/",
"related": {
"created_by": "/api/v1/users/1/",
"unified_job_template": "/api/v1/workflow_job_templates/27/",
"workflow_job_template": "/api/v1/workflow_job_templates/27/",
"notifications": "/api/v1/workflow_jobs/109/notifications/",
"workflow_nodes": "/api/v1/workflow_jobs/109/workflow_nodes/",
"labels": "/api/v1/workflow_jobs/109/labels/",
"activity_stream": "/api/v1/workflow_jobs/109/activity_stream/",
"relaunch": "/api/v1/workflow_jobs/109/relaunch/",
"cancel": "/api/v1/workflow_jobs/109/cancel/"
"created_by": "/api/v2/users/1/",
"unified_job_template": "/api/v2/workflow_job_templates/27/",
"workflow_job_template": "/api/v2/workflow_job_templates/27/",
"notifications": "/api/v2/workflow_jobs/109/notifications/",
"workflow_nodes": "/api/v2/workflow_jobs/109/workflow_nodes/",
"labels": "/api/v2/workflow_jobs/109/labels/",
"activity_stream": "/api/v2/workflow_jobs/109/activity_stream/",
"relaunch": "/api/v2/workflow_jobs/109/relaunch/",
"cancel": "/api/v2/workflow_jobs/109/cancel/"
},
"summary_fields": {
"workflow_job_template": {