fix query-binding tests

Author: mbuliard

src/LiveComponent/assets/test/controller/query-binding.test.ts

@@ -49,14 +49,14 @@ describe('LiveController query string binding', () => {
         // String
 
         // Set value
-        test.expectsAjaxCall().expectUpdatedData({ prop1: 'foo' });
+        test.expectsAjaxCall().expectUpdatedData({ prop1: 'foo' }).willReturnLiveUrl('?prop1=foo&prop2=');
 
         await test.component.set('prop1', 'foo', true);
 
         expectCurrentSearch().toEqual('?prop1=foo&prop2=');
 
         // Remove value
-        test.expectsAjaxCall().expectUpdatedData({ prop1: '' });
+        test.expectsAjaxCall().expectUpdatedData({ prop1: '' }).willReturnLiveUrl('?prop1=&prop2=');
 
         await test.component.set('prop1', '', true);
 
@@ -65,14 +65,14 @@ describe('LiveController query string binding', () => {
         // Number
 
         // Set value
-        test.expectsAjaxCall().expectUpdatedData({ prop2: 42 });
+        test.expectsAjaxCall().expectUpdatedData({ prop2: 42 }).willReturnLiveUrl('?prop1=&prop2=42');
 
         await test.component.set('prop2', 42, true);
 
         expectCurrentSearch().toEqual('?prop1=&prop2=42');
 
         // Remove value
-        test.expectsAjaxCall().expectUpdatedData({ prop2: null });
+        test.expectsAjaxCall().expectUpdatedData({ prop2: null }).willReturnLiveUrl('?prop1=&prop2=');
 
         await test.component.set('prop2', null, true);
 
@@ -88,21 +88,25 @@ describe('LiveController query string binding', () => {
         );
 
         // Set value
-        test.expectsAjaxCall().expectUpdatedData({ prop: ['foo', 'bar'] });
+        test.expectsAjaxCall()
+            .expectUpdatedData({ prop: ['foo', 'bar'] })
+            .willReturnLiveUrl('?prop[0]=foo&prop[1]=bar');
 
         await test.component.set('prop', ['foo', 'bar'], true);
 
         expectCurrentSearch().toEqual('?prop[0]=foo&prop[1]=bar');
 
         // Remove one value
-        test.expectsAjaxCall().expectUpdatedData({ prop: ['foo'] });
+        test.expectsAjaxCall()
+            .expectUpdatedData({ prop: ['foo'] })
+            .willReturnLiveUrl('?prop[0]=foo');
 
         await test.component.set('prop', ['foo'], true);
 
         expectCurrentSearch().toEqual('?prop[0]=foo');
 
         // Remove all remaining values
-        test.expectsAjaxCall().expectUpdatedData({ prop: [] });
+        test.expectsAjaxCall().expectUpdatedData({ prop: [] }).willReturnLiveUrl('?prop=');
 
         await test.component.set('prop', [], true);
 
@@ -118,28 +122,34 @@ describe('LiveController query string binding', () => {
         );
 
         // Set single nested prop
-        test.expectsAjaxCall().expectUpdatedData({ 'prop.foo': 'dummy' });
+        test.expectsAjaxCall().expectUpdatedData({ 'prop.foo': 'dummy' }).willReturnLiveUrl('?prop[foo]=dummy');
 
         await test.component.set('prop.foo', 'dummy', true);
 
         expectCurrentSearch().toEqual('?prop[foo]=dummy');
 
         // Set multiple values
-        test.expectsAjaxCall().expectUpdatedData({ prop: { foo: 'other', bar: 42 } });
+        test.expectsAjaxCall()
+            .expectUpdatedData({ prop: { foo: 'other', bar: 42 } })
+            .willReturnLiveUrl('?prop[foo]=other&prop[bar]=42');
 
         await test.component.set('prop', { foo: 'other', bar: 42 }, true);
 
         expectCurrentSearch().toEqual('?prop[foo]=other&prop[bar]=42');
 
         // Remove one value
-        test.expectsAjaxCall().expectUpdatedData({ prop: { foo: 'other', bar: null } });
+        test.expectsAjaxCall()
+            .expectUpdatedData({ prop: { foo: 'other', bar: null } })
+            .willReturnLiveUrl('?prop[foo]=other');
 
         await test.component.set('prop', { foo: 'other', bar: null }, true);
 
         expectCurrentSearch().toEqual('?prop[foo]=other');
 
         // Remove all values
-        test.expectsAjaxCall().expectUpdatedData({ prop: { foo: null, bar: null } });
+        test.expectsAjaxCall()
+            .expectUpdatedData({ prop: { foo: null, bar: null } })
+            .willReturnLiveUrl('?prop=');
 
         await test.component.set('prop', { foo: null, bar: null }, true);
 
@@ -161,13 +171,15 @@ describe('LiveController query string binding', () => {
             .expectActionCalled('changeProp')
             .serverWillChangeProps((data: any) => {
                 data.prop = 'foo';
-            });
+            })
+            .willReturnLiveUrl('?prop=foo');
 
         getByText(test.element, 'Change prop').click();
 
-        await waitFor(() => expect(test.element).toHaveTextContent('Prop: foo'));
-
-        expectCurrentSearch().toEqual('?prop=foo');
+        await waitFor(() => {
+            expect(test.element).toHaveTextContent('Prop: foo');
+            expectCurrentSearch().toEqual('?prop=foo');
+        });
     });
 
     it('uses custom name instead of prop name in the URL', async () => {
@@ -179,14 +191,14 @@ describe('LiveController query string binding', () => {
         );
 
         // Set value
-        test.expectsAjaxCall().expectUpdatedData({ prop1: 'foo' });
+        test.expectsAjaxCall().expectUpdatedData({ prop1: 'foo' }).willReturnLiveUrl('?alias1=foo');
 
         await test.component.set('prop1', 'foo', true);
 
         expectCurrentSearch().toEqual('?alias1=foo');
 
         // Remove value
-        test.expectsAjaxCall().expectUpdatedData({ prop1: '' });
+        test.expectsAjaxCall().expectUpdatedData({ prop1: '' }).willReturnLiveUrl('?alias1=');
 
         await test.component.set('prop1', '', true);
 

src/LiveComponent/assets/test/tools.ts

@@ -173,6 +173,7 @@ class MockedAjaxCall {
     /* Response properties */
     private changePropsCallback?: (props: any) => void;
     private template?: (props: any) => string;
+    private liveUrl?: string;
     private delayResponseTime?: number = 0;
     private customResponseStatusCode?: number;
     private customResponseHTML?: string;
@@ -269,10 +270,16 @@ class MockedAjaxCall {
                 const html = this.customResponseHTML ? this.customResponseHTML : template(newProps);
 
                 // assume a normal, live-component response unless it's totally custom
-                const headers = { 'Content-Type': 'application/vnd.live-component+html' };
+                const headers = {
+                    'Content-Type': 'application/vnd.live-component+html',
+                    'X-Live-Url': '',
+                };
                 if (this.customResponseHTML) {
                     headers['Content-Type'] = 'text/html';
                 }
+                if (this.liveUrl) {
+                    headers['X-Live-Url'] = this.liveUrl;
+                }
 
                 const response = new Response(html, {
                     status: this.customResponseStatusCode || 200,
@@ -342,6 +349,12 @@ class MockedAjaxCall {
         return this;
     }
 
+    willReturnLiveUrl(liveUrl: string): MockedAjaxCall {
+        this.liveUrl = liveUrl;
+
+        return this;
+    }
+
     serverWillReturnCustomResponse(statusCode: number, responseHTML: string): MockedAjaxCall {
         this.customResponseStatusCode = statusCode;
         this.customResponseHTML = responseHTML;