@@ -31,7 +31,7 @@ protected function setUp()
31
31
}
32
32
33
33
/**
34
- * Tests if target_path(canonical_url ) is resolved for Product entity
34
+ * Tests if target_path(relative_url ) is resolved for Product entity
35
35
*
36
36
* @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
37
37
*/
@@ -60,20 +60,20 @@ public function testProductUrlResolver()
60
60
urlResolver(url:" {$ urlPath }")
61
61
{
62
62
id
63
- canonical_url
63
+ relative_url
64
64
type
65
65
}
66
66
}
67
67
QUERY ;
68
68
$ response = $ this ->graphQlQuery ($ query );
69
69
$ this ->assertArrayHasKey ('urlResolver ' , $ response );
70
70
$ this ->assertEquals ($ product ->getEntityId (), $ response ['urlResolver ' ]['id ' ]);
71
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
71
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
72
72
$ this ->assertEquals (strtoupper ($ expectedType ), $ response ['urlResolver ' ]['type ' ]);
73
73
}
74
74
75
75
/**
76
- * Tests the use case where canonical_url is provided as resolver input in the Query
76
+ * Tests the use case where relative_url is provided as resolver input in the Query
77
77
*
78
78
* @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
79
79
*/
@@ -104,15 +104,15 @@ public function testProductUrlWithCanonicalUrlInput()
104
104
urlResolver(url:" {$ canonicalPath }")
105
105
{
106
106
id
107
- canonical_url
107
+ relative_url
108
108
type
109
109
}
110
110
}
111
111
QUERY ;
112
112
$ response = $ this ->graphQlQuery ($ query );
113
113
$ this ->assertArrayHasKey ('urlResolver ' , $ response );
114
114
$ this ->assertEquals ($ product ->getEntityId (), $ response ['urlResolver ' ]['id ' ]);
115
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
115
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
116
116
$ this ->assertEquals (strtoupper ($ expectedType ), $ response ['urlResolver ' ]['type ' ]);
117
117
}
118
118
@@ -147,15 +147,15 @@ public function testCategoryUrlResolver()
147
147
urlResolver(url:" {$ urlPath2 }")
148
148
{
149
149
id
150
- canonical_url
150
+ relative_url
151
151
type
152
152
}
153
153
}
154
154
QUERY ;
155
155
$ response = $ this ->graphQlQuery ($ query );
156
156
$ this ->assertArrayHasKey ('urlResolver ' , $ response );
157
157
$ this ->assertEquals ($ categoryId , $ response ['urlResolver ' ]['id ' ]);
158
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
158
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
159
159
$ this ->assertEquals (strtoupper ($ expectedType ), $ response ['urlResolver ' ]['type ' ]);
160
160
}
161
161
@@ -183,14 +183,14 @@ public function testCMSPageUrlResolver()
183
183
urlResolver(url:" {$ requestPath }")
184
184
{
185
185
id
186
- canonical_url
186
+ relative_url
187
187
type
188
188
}
189
189
}
190
190
QUERY ;
191
191
$ response = $ this ->graphQlQuery ($ query );
192
192
$ this ->assertEquals ($ cmsPageId , $ response ['urlResolver ' ]['id ' ]);
193
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
193
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
194
194
$ this ->assertEquals (strtoupper (str_replace ('- ' , '_ ' , $ expectedEntityType )), $ response ['urlResolver ' ]['type ' ]);
195
195
}
196
196
@@ -226,15 +226,15 @@ public function testProductUrlRewriteResolver()
226
226
urlResolver(url:" {$ urlPath }")
227
227
{
228
228
id
229
- canonical_url
229
+ relative_url
230
230
type
231
231
}
232
232
}
233
233
QUERY ;
234
234
$ response = $ this ->graphQlQuery ($ query );
235
235
$ this ->assertArrayHasKey ('urlResolver ' , $ response );
236
236
$ this ->assertEquals ($ product ->getEntityId (), $ response ['urlResolver ' ]['id ' ]);
237
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
237
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
238
238
$ this ->assertEquals (strtoupper ($ expectedType ), $ response ['urlResolver ' ]['type ' ]);
239
239
}
240
240
@@ -266,7 +266,7 @@ public function testInvalidUrlResolverInput()
266
266
urlResolver(url:" {$ urlPath }")
267
267
{
268
268
id
269
- canonical_url
269
+ relative_url
270
270
type
271
271
}
272
272
}
@@ -307,15 +307,15 @@ public function testCategoryUrlWithLeadingSlash()
307
307
urlResolver(url:"/ {$ urlPath }")
308
308
{
309
309
id
310
- canonical_url
310
+ relative_url
311
311
type
312
312
}
313
313
}
314
314
QUERY ;
315
315
$ response = $ this ->graphQlQuery ($ query );
316
316
$ this ->assertArrayHasKey ('urlResolver ' , $ response );
317
317
$ this ->assertEquals ($ categoryId , $ response ['urlResolver ' ]['id ' ]);
318
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
318
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
319
319
$ this ->assertEquals (strtoupper ($ expectedType ), $ response ['urlResolver ' ]['type ' ]);
320
320
}
321
321
@@ -344,15 +344,15 @@ public function testResolveSlash()
344
344
urlResolver(url:"/")
345
345
{
346
346
id
347
- canonical_url
347
+ relative_url
348
348
type
349
349
}
350
350
}
351
351
QUERY ;
352
352
$ response = $ this ->graphQlQuery ($ query );
353
353
$ this ->assertArrayHasKey ('urlResolver ' , $ response );
354
354
$ this ->assertEquals ($ homePageId , $ response ['urlResolver ' ]['id ' ]);
355
- $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['canonical_url ' ]);
355
+ $ this ->assertEquals ($ targetPath , $ response ['urlResolver ' ]['relative_url ' ]);
356
356
$ this ->assertEquals ('CMS_PAGE ' , $ response ['urlResolver ' ]['type ' ]);
357
357
}
358
358
}
0 commit comments