Skip to content

Commit 7fc914b

Browse files
pentopento
committed
REST API: Update the fixture data for wp-api.js tests.
[41139] changed how the REST API URL is generated, but included an incorrect version of `wp-api-generated.js`. This updates the generator to create the correct `wp-api-generated.js`, and updates ``wp-api-generated.js`. See #40886. git-svn-id: https://develop.svn.wordpress.org/trunk@41154 602fd350-edb4-49c9-b593-d223f7449a82
1 parent bdc79c0 commit 7fc914b

2 files changed

Lines changed: 90 additions & 90 deletions

File tree

‎tests/phpunit/tests/rest-api/rest-schema-setup.php‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -381,26 +381,26 @@ public function test_build_wp_api_client_fixtures() {
381381
'Schema.name' => 'Test Blog',
382382
'Schema.url' => 'http://example.org',
383383
'Schema.home' => 'http://example.org',
384-
'Schema.routes./._links.self' => 'http://example.org/?rest_route=/',
385-
'Schema.routes./oembed/1.0._links.self' => 'http://example.org/?rest_route=/oembed/1.0',
386-
'Schema.routes./oembed/1.0/embed._links.self' => 'http://example.org/?rest_route=/oembed/1.0/embed',
387-
'Schema.routes./oembed/1.0/proxy._links.self' => 'http://example.org/?rest_route=/oembed/1.0/proxy',
388-
'Schema.routes./wp/v2._links.self' => 'http://example.org/?rest_route=/wp/v2',
389-
'Schema.routes./wp/v2/posts._links.self' => 'http://example.org/?rest_route=/wp/v2/posts',
390-
'Schema.routes./wp/v2/pages._links.self' => 'http://example.org/?rest_route=/wp/v2/pages',
391-
'Schema.routes./wp/v2/media._links.self' => 'http://example.org/?rest_route=/wp/v2/media',
392-
'Schema.routes./wp/v2/types._links.self' => 'http://example.org/?rest_route=/wp/v2/types',
393-
'Schema.routes./wp/v2/statuses._links.self' => 'http://example.org/?rest_route=/wp/v2/statuses',
394-
'Schema.routes./wp/v2/taxonomies._links.self' => 'http://example.org/?rest_route=/wp/v2/taxonomies',
395-
'Schema.routes./wp/v2/categories._links.self' => 'http://example.org/?rest_route=/wp/v2/categories',
396-
'Schema.routes./wp/v2/tags._links.self' => 'http://example.org/?rest_route=/wp/v2/tags',
397-
'Schema.routes./wp/v2/users._links.self' => 'http://example.org/?rest_route=/wp/v2/users',
398-
'Schema.routes./wp/v2/users/me._links.self' => 'http://example.org/?rest_route=/wp/v2/users/me',
399-
'Schema.routes./wp/v2/comments._links.self' => 'http://example.org/?rest_route=/wp/v2/comments',
400-
'Schema.routes./wp/v2/settings._links.self' => 'http://example.org/?rest_route=/wp/v2/settings',
401-
'oembed.routes./oembed/1.0._links.self' => 'http://example.org/?rest_route=/oembed/1.0',
402-
'oembed.routes./oembed/1.0/embed._links.self' => 'http://example.org/?rest_route=/oembed/1.0/embed',
403-
'oembed.routes./oembed/1.0/proxy._links.self' => 'http://example.org/?rest_route=/oembed/1.0/proxy',
384+
'Schema.routes./._links.self' => 'http://example.org/index.php?rest_route=/',
385+
'Schema.routes./oembed/1.0._links.self' => 'http://example.org/index.php?rest_route=/oembed/1.0',
386+
'Schema.routes./oembed/1.0/embed._links.self' => 'http://example.org/index.php?rest_route=/oembed/1.0/embed',
387+
'Schema.routes./oembed/1.0/proxy._links.self' => 'http://example.org/index.php?rest_route=/oembed/1.0/proxy',
388+
'Schema.routes./wp/v2._links.self' => 'http://example.org/index.php?rest_route=/wp/v2',
389+
'Schema.routes./wp/v2/posts._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/posts',
390+
'Schema.routes./wp/v2/pages._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/pages',
391+
'Schema.routes./wp/v2/media._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/media',
392+
'Schema.routes./wp/v2/types._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/types',
393+
'Schema.routes./wp/v2/statuses._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/statuses',
394+
'Schema.routes./wp/v2/taxonomies._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies',
395+
'Schema.routes./wp/v2/categories._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/categories',
396+
'Schema.routes./wp/v2/tags._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/tags',
397+
'Schema.routes./wp/v2/users._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/users',
398+
'Schema.routes./wp/v2/users/me._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/users/me',
399+
'Schema.routes./wp/v2/comments._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/comments',
400+
'Schema.routes./wp/v2/settings._links.self' => 'http://example.org/index.php?rest_route=/wp/v2/settings',
401+
'oembed.routes./oembed/1.0._links.self' => 'http://example.org/index.php?rest_route=/oembed/1.0',
402+
'oembed.routes./oembed/1.0/embed._links.self' => 'http://example.org/index.php?rest_route=/oembed/1.0/embed',
403+
'oembed.routes./oembed/1.0/proxy._links.self' => 'http://example.org/index.php?rest_route=/oembed/1.0/proxy',
404404
'oembeds.provider_name' => 'Test Blog',
405405
'oembeds.provider_url' => 'http://example.org',
406406
'oembeds.author_name' => 'Test Blog',
@@ -409,14 +409,14 @@ public function test_build_wp_api_client_fixtures() {
409409
'PostsCollection.0.id' => 3,
410410
'PostsCollection.0.guid.rendered' => 'http://example.org/?p=3',
411411
'PostsCollection.0.link' => 'http://example.org/?p=3',
412-
'PostsCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/posts/3',
413-
'PostsCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/posts',
414-
'PostsCollection.0._links.about.0.href' => 'http://example.org/?rest_route=/wp/v2/types/post',
415-
'PostsCollection.0._links.replies.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fcomments&post=3',
416-
'PostsCollection.0._links.version-history.0.href' => 'http://example.org/?rest_route=/wp/v2/posts/3/revisions',
417-
'PostsCollection.0._links.wp:attachment.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3',
418-
'PostsCollection.0._links.wp:term.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fcategories&post=3',
419-
'PostsCollection.0._links.wp:term.1.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Ftags&post=3',
412+
'PostsCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/3',
413+
'PostsCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts',
414+
'PostsCollection.0._links.about.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types/post',
415+
'PostsCollection.0._links.replies.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3',
416+
'PostsCollection.0._links.version-history.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/3/revisions',
417+
'PostsCollection.0._links.wp:attachment.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3',
418+
'PostsCollection.0._links.wp:term.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3',
419+
'PostsCollection.0._links.wp:term.1.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3',
420420
'PostModel.id' => 3,
421421
'PostModel.guid.rendered' => 'http://example.org/?p=3',
422422
'PostModel.link' => 'http://example.org/?p=3',
@@ -425,7 +425,7 @@ public function test_build_wp_api_client_fixtures() {
425425
'postRevisions.0.parent' => 3,
426426
'postRevisions.0.slug' => '3-revision-v1',
427427
'postRevisions.0.guid.rendered' => 'http://example.org/?p=4',
428-
'postRevisions.0._links.parent.0.href' => 'http://example.org/?rest_route=/wp/v2/posts/3',
428+
'postRevisions.0._links.parent.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/3',
429429
'revision.author' => 2,
430430
'revision.id' => 4,
431431
'revision.parent' => 3,
@@ -434,12 +434,12 @@ public function test_build_wp_api_client_fixtures() {
434434
'PagesCollection.0.id' => 5,
435435
'PagesCollection.0.guid.rendered' => 'http://example.org/?page_id=5',
436436
'PagesCollection.0.link' => 'http://example.org/?page_id=5',
437-
'PagesCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/pages/5',
438-
'PagesCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/pages',
439-
'PagesCollection.0._links.about.0.href' => 'http://example.org/?rest_route=/wp/v2/types/page',
440-
'PagesCollection.0._links.replies.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fcomments&post=5',
441-
'PagesCollection.0._links.version-history.0.href' => 'http://example.org/?rest_route=/wp/v2/pages/5/revisions',
442-
'PagesCollection.0._links.wp:attachment.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5',
437+
'PagesCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/5',
438+
'PagesCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages',
439+
'PagesCollection.0._links.about.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types/page',
440+
'PagesCollection.0._links.replies.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5',
441+
'PagesCollection.0._links.version-history.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/5/revisions',
442+
'PagesCollection.0._links.wp:attachment.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5',
443443
'PageModel.id' => 5,
444444
'PageModel.guid.rendered' => 'http://example.org/?page_id=5',
445445
'PageModel.link' => 'http://example.org/?page_id=5',
@@ -448,7 +448,7 @@ public function test_build_wp_api_client_fixtures() {
448448
'pageRevisions.0.parent' => 5,
449449
'pageRevisions.0.slug' => '5-revision-v1',
450450
'pageRevisions.0.guid.rendered' => 'http://example.org/?p=6',
451-
'pageRevisions.0._links.parent.0.href' => 'http://example.org/?rest_route=/wp/v2/pages/5',
451+
'pageRevisions.0._links.parent.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/5',
452452
'pageRevision.author' => 2,
453453
'pageRevision.id' => 6,
454454
'pageRevision.parent' => 5,
@@ -459,65 +459,65 @@ public function test_build_wp_api_client_fixtures() {
459459
'MediaCollection.0.link' => 'http://example.org/?attachment_id=7',
460460
'MediaCollection.0.description.rendered' => '<p class="attachment"><!-- <a...><img.../></a> --></p>',
461461
'MediaCollection.0.source_url' => 'http://example.org/wp-content/uploads//tmp/canola.jpg',
462-
'MediaCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/media/7',
463-
'MediaCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/media',
464-
'MediaCollection.0._links.about.0.href' => 'http://example.org/?rest_route=/wp/v2/types/attachment',
465-
'MediaCollection.0._links.replies.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fcomments&post=7',
462+
'MediaCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/media/7',
463+
'MediaCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/media',
464+
'MediaCollection.0._links.about.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types/attachment',
465+
'MediaCollection.0._links.replies.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=7',
466466
'MediaModel.id' => 7,
467467
'MediaModel.guid.rendered' => 'http://example.org/?attachment_id=7',
468468
'MediaModel.link' => 'http://example.org/?attachment_id=7',
469469
'MediaModel.description.rendered' => '<p class="attachment"><!-- <a...><img.../></a> --></p>',
470470
'MediaModel.source_url' => 'http://example.org/wp-content/uploads//tmp/canola.jpg',
471-
'TypesCollection.post._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/types',
472-
'TypesCollection.post._links.wp:items.0.href' => 'http://example.org/?rest_route=/wp/v2/posts',
473-
'TypesCollection.page._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/types',
474-
'TypesCollection.page._links.wp:items.0.href' => 'http://example.org/?rest_route=/wp/v2/pages',
475-
'TypesCollection.attachment._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/types',
476-
'TypesCollection.attachment._links.wp:items.0.href' => 'http://example.org/?rest_route=/wp/v2/media',
477-
'StatusesCollection.publish._links.archives.0.href' => 'http://example.org/?rest_route=/wp/v2/posts',
478-
'StatusesCollection.future._links.archives.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&status=future',
479-
'StatusesCollection.draft._links.archives.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&status=draft',
480-
'StatusesCollection.pending._links.archives.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&status=pending',
481-
'StatusesCollection.private._links.archives.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&status=private',
482-
'StatusesCollection.trash._links.archives.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&status=trash',
483-
'TaxonomiesCollection.category._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/taxonomies',
484-
'TaxonomiesCollection.category._links.wp:items.0.href' => 'http://example.org/?rest_route=/wp/v2/categories',
485-
'TaxonomiesCollection.post_tag._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/taxonomies',
486-
'TaxonomiesCollection.post_tag._links.wp:items.0.href' => 'http://example.org/?rest_route=/wp/v2/tags',
471+
'TypesCollection.post._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types',
472+
'TypesCollection.post._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts',
473+
'TypesCollection.page._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types',
474+
'TypesCollection.page._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages',
475+
'TypesCollection.attachment._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types',
476+
'TypesCollection.attachment._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/media',
477+
'StatusesCollection.publish._links.archives.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts',
478+
'StatusesCollection.future._links.archives.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=future',
479+
'StatusesCollection.draft._links.archives.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=draft',
480+
'StatusesCollection.pending._links.archives.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=pending',
481+
'StatusesCollection.private._links.archives.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=private',
482+
'StatusesCollection.trash._links.archives.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=trash',
483+
'TaxonomiesCollection.category._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies',
484+
'TaxonomiesCollection.category._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/categories',
485+
'TaxonomiesCollection.post_tag._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies',
486+
'TaxonomiesCollection.post_tag._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/tags',
487487
'CategoriesCollection.0.link' => 'http://example.org/?cat=1',
488-
'CategoriesCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/categories/1',
489-
'CategoriesCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/categories',
490-
'CategoriesCollection.0._links.about.0.href' => 'http://example.org/?rest_route=/wp/v2/taxonomies/category',
491-
'CategoriesCollection.0._links.wp:post_type.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&categories=1',
488+
'CategoriesCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/categories/1',
489+
'CategoriesCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/categories',
490+
'CategoriesCollection.0._links.about.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies/category',
491+
'CategoriesCollection.0._links.wp:post_type.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&categories=1',
492492
'CategoryModel.link' => 'http://example.org/?cat=1',
493493
'TagsCollection.0.id' => 2,
494494
'TagsCollection.0.link' => 'http://example.org/?tag=restapi-client-fixture-tag',
495-
'TagsCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/tags/2',
496-
'TagsCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/tags',
497-
'TagsCollection.0._links.about.0.href' => 'http://example.org/?rest_route=/wp/v2/taxonomies/post_tag',
498-
'TagsCollection.0._links.wp:post_type.0.href' => 'http://example.org/?rest_route=%2Fwp%2Fv2%2Fposts&tags=2',
495+
'TagsCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/tags/2',
496+
'TagsCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/tags',
497+
'TagsCollection.0._links.about.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies/post_tag',
498+
'TagsCollection.0._links.wp:post_type.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&tags=2',
499499
'TagModel.id' => 2,
500500
'TagModel.link' => 'http://example.org/?tag=restapi-client-fixture-tag',
501501
'UsersCollection.0.link' => 'http://example.org/?author=1',
502502
'UsersCollection.0.avatar_urls.24' => 'http://0.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g',
503503
'UsersCollection.0.avatar_urls.48' => 'http://0.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g',
504504
'UsersCollection.0.avatar_urls.96' => 'http://0.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=96&d=mm&r=g',
505-
'UsersCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/users/1',
506-
'UsersCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/users',
505+
'UsersCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/users/1',
506+
'UsersCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/users',
507507
'UsersCollection.1.id' => 2,
508508
'UsersCollection.1.link' => 'http://example.org/?author=2',
509-
'UsersCollection.1._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/users/2',
510-
'UsersCollection.1._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/users',
509+
'UsersCollection.1._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/users/2',
510+
'UsersCollection.1._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/users',
511511
'UserModel.id' => 2,
512512
'UserModel.link' => 'http://example.org/?author=2',
513513
'me.id' => 2,
514514
'me.link' => 'http://example.org/?author=2',
515515
'CommentsCollection.0.id' => 2,
516516
'CommentsCollection.0.post' => 3,
517517
'CommentsCollection.0.link' => 'http://example.org/?p=3#comment-2',
518-
'CommentsCollection.0._links.self.0.href' => 'http://example.org/?rest_route=/wp/v2/comments/2',
519-
'CommentsCollection.0._links.collection.0.href' => 'http://example.org/?rest_route=/wp/v2/comments',
520-
'CommentsCollection.0._links.up.0.href' => 'http://example.org/?rest_route=/wp/v2/posts/3',
518+
'CommentsCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/comments/2',
519+
'CommentsCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/comments',
520+
'CommentsCollection.0._links.up.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/3',
521521
'CommentModel.id' => 2,
522522
'CommentModel.post' => 3,
523523
'CommentModel.link' => 'http://example.org/?p=3#comment-2',

0 commit comments

Comments
 (0)