Update tests to assume container relative URLs

Author: labkey-alan

src/labkey/ActionURL.spec.ts

@@ -31,13 +31,13 @@ describe('ActionURL', () => {
 
         it('should build the correct URL', () => {
             const url = ActionURL.buildURL('project', 'getWebPart', 'MyContainer');
-            expect(url).toEqual('/project/MyContainer/getWebPart.view');
+            expect(url).toEqual('/MyContainer/project-getWebPart.view');
         });
 
         it('should build the correct URL with optional parameters', () => {
             const params = { listId: 50, returnUrl: 'home', array: [10, 'li'] };
             const url = ActionURL.buildURL('project', 'getWebPart', 'MyContainer', params);
-            expect(url).toEqual('/project/MyContainer/getWebPart.view?listId=50&returnUrl=home&array=10&array=li');
+            expect(url).toEqual('/MyContainer/project-getWebPart.view?listId=50&returnUrl=home&array=10&array=li');
         });
     });
 

src/labkey/Assay.spec.ts

@@ -40,7 +40,7 @@ describe('assayList.api requests', () => {
         // Assert
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
-                url: '/assay/my/special/folder/assayList.api',
+                url: '/my/special/folder/assay-assayList.api',
             })
         );
     });
@@ -59,7 +59,7 @@ describe('assayList.api requests', () => {
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
                 jsonData: { id: assayId },
-                url: '/assay/my/special/folder/assayList.api',
+                url: '/my/special/folder/assay-assayList.api',
             })
         );
     });
@@ -78,7 +78,7 @@ describe('assayList.api requests', () => {
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
                 jsonData: { name: assayName },
-                url: '/assay/my/special/folder/assayList.api',
+                url: '/my/special/folder/assay-assayList.api',
             })
         );
     });
@@ -97,7 +97,7 @@ describe('assayList.api requests', () => {
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
                 jsonData: { type: assayType },
-                url: '/assay/my/special/folder/assayList.api',
+                url: '/my/special/folder/assay-assayList.api',
             })
         );
     });
@@ -117,7 +117,7 @@ describe('assayList.api requests', () => {
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
                 jsonData: { id, name, plateEnabled, status, type },
-                url: '/assay/assayList.api',
+                url: '/assay-assayList.api',
             })
         );
     });

src/labkey/Report.spec.ts

@@ -35,7 +35,7 @@ describe('execute', () => {
         // Assert
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
-                url: '/reports/execute.api',
+                url: '/reports-execute.api',
                 method: 'POST',
                 jsonData: {
                     reportId: 'db:123',

src/labkey/query/Rows.spec.ts

@@ -40,7 +40,7 @@ describe('deleteRows', () => {
                     rows,
                     schemaName,
                 }),
-                url: '/query/deleteRows.api',
+                url: '/query-deleteRows.api',
             })
         );
     });
@@ -69,7 +69,7 @@ describe('insertRows', () => {
                     rows,
                     schemaName,
                 }),
-                url: '/query/insertRows.api',
+                url: '/query-insertRows.api',
             })
         );
     });
@@ -92,7 +92,7 @@ describe('insertRows', () => {
             expect.objectContaining({
                 method: 'POST',
                 form: expect.anything(),
-                url: '/query/insertRows.api',
+                url: '/query-insertRows.api',
             })
         );
         expect(requestSpy).toHaveBeenCalledWith(
@@ -117,7 +117,7 @@ describe('insertRows', () => {
             expect.objectContaining({
                 method: 'POST',
                 form: expect.anything(),
-                url: '/query/insertRows.api',
+                url: '/query-insertRows.api',
             })
         );
     });
@@ -146,7 +146,7 @@ describe('updateRows', () => {
                     rows,
                     schemaName,
                 }),
-                url: '/query/updateRows.api',
+                url: '/query-updateRows.api',
             })
         );
     });
@@ -169,7 +169,7 @@ describe('updateRows', () => {
             expect.objectContaining({
                 method: 'POST',
                 form: expect.anything(),
-                url: '/query/updateRows.api',
+                url: '/query-updateRows.api',
             })
         );
         expect(requestSpy).toHaveBeenCalledWith(
@@ -224,7 +224,7 @@ describe('saveRows', () => {
                 jsonData: expect.objectContaining({
                     commands,
                 }),
-                url: '/query/saveRows.api',
+                url: '/query-saveRows.api',
             })
         );
     });
@@ -267,7 +267,7 @@ describe('saveRows', () => {
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
                 method: 'POST',
-                url: '/query/saveRows.api',
+                url: '/query-saveRows.api',
             })
         );
         const form = requestSpy.mock.lastCall[0].form;

src/labkey/query/SelectRows.spec.ts

@@ -88,7 +88,7 @@ describe('selectRows', () => {
         expect(requestSpy).toHaveBeenCalledWith(
             expect.objectContaining({
                 // default to container-free URL
-                url: '/query/getQuery.api',
+                url: '/query-getQuery.api',
 
                 // default to 'GET' request
                 method: 'GET',
@@ -138,7 +138,7 @@ describe('selectRows -- optional parameters', () => {
 
     test('containerPath', () => {
         const containerPath = '/container';
-        expect(selectRowsRequest({ containerPath })).toHaveProperty('url', '/query/container/getQuery.api');
+        expect(selectRowsRequest({ containerPath })).toHaveProperty('url', '/container/query-getQuery.api');
     });
 
     test('dataRegionName', () => {