Changeset 40109 for trunk

Timestamp:

02/24/2017 06:39:39 PM (8 years ago)

Author:

adamsilverstein

Message:

REST API: JS client - QUnit tests for custom namespace route discovery.

Add QUnit tests for the parsing of custom namespace routes. Add a custom schema fixture based on the wp-js-widgets plugin. Test that the client can parse the widget namespace in the schema and correctly construct the expected group of models and collections. Also includes a small unrelated QUnit fix to ensure nav-menu test passes when it is loaded without its tests executing as well as a small jshint fix, adding a missing semicolon since [40107].

Props jnylen0.
Fixes #39561.

Location:

trunk

Files:

• src/wp-admin/js/theme.js (modified) (1 diff)
• tests/qunit/fixtures/js-widgets-endpoint.js (added)
• tests/qunit/fixtures/wp-api.js (modified) (2 diffs)
• tests/qunit/index.html (modified) (1 diff)
• tests/qunit/wp-admin/js/nav-menu.js (modified) (1 diff)
• tests/qunit/wp-includes/js/wp-api.js (modified) (1 diff)

trunk/src/wp-admin/js/theme.js

@@ -1929 +1929 @@
                 self.view.collection.once( 'query:success', function() {
                     $( 'div[data-slug="' + slug + '"]' ).trigger( 'click' );
-                })
+                });
 
             }

trunk/tests/qunit/fixtures/wp-api.js

@@ -1 @@
-/* global mockedApiResponse, Backbone */
+/* global mockedApiResponse, Backbone, jsWidgetsEndpointSchema */
 /**
  * @var mockedApiResponse defined in wp-api-generated.js
@@ -24 +24 @@
     'wp-json/wp/v2/taxonomy': mockedApiResponse.TaxonomyModel,
     'wp-json/wp/v2/status': mockedApiResponse.StatusModel,
-    'wp-json/wp/v2/type': mockedApiResponse.TypeModel
+    'wp-json/wp/v2/type': mockedApiResponse.TypeModel,
+    'wp-json/js-widgets/v1/': jsWidgetsEndpointSchema
 };
 

trunk/tests/qunit/index.html

@@ -41 +41 @@
             <script src="fixtures/customize-widgets.js"></script>
             <script src="fixtures/wp-api-generated.js"></script>
+            <script src="fixtures/js-widgets-endpoint.js"></script>
             <script src="fixtures/wp-api.js"></script>
         </div>

trunk/tests/qunit/wp-admin/js/nav-menu.js

@@ -8 +8 @@
     // Fail if we don't see the expected number of events triggered in 1500 ms.
     setTimeout( function() {
-        assert.equal(
+        // QUnit may load this file without running it, in which case `assert`
+        // will never be set to `assertPassed` below.
+        assert && assert.equal(
             eventsFired,
             eventsExpected,

trunk/tests/qunit/wp-includes/js/wp-api.js

@@ -193 +193 @@
     } );
 
+// Test the jswidget custom namespace and endpoints.
+wp.api.init( {
+    'versionString': 'js-widgets/v1/'
+} ).done( function() {
+        var customClasses = [
+            'WidgetsArchives',
+            'WidgetsCalendar',
+            'WidgetsCategories',
+            'WidgetsMeta',
+            'WidgetsNav_menu',
+            'WidgetsPages',
+            'WidgetsPostCollection',
+            'WidgetsRecentComments',
+            'WidgetsRecentPosts',
+            'WidgetsRss',
+            'WidgetsSearch',
+            'WidgetsTag_cloud',
+            'WidgetsText'
+        ];
+
+        // Check that we have and can get each model type.
+        _.each( customClasses, function( className ) {
+            QUnit.test( 'Checking ' + className + ' class name.' , function( assert ) {
+                var done = assert.async();
+
+                assert.expect( 2 );
+
+                wp.api.loadPromise.done( function() {
+                    var theModel = new wp.api.models[ className ]();
+                    assert.ok( theModel, 'We can instantiate wp.api.models.' + className );
+                    var theCollection = new wp.api.collections[ className ]();
+                    assert.ok( theCollection, 'We can instantiate wp.api.collections.' + className );
+                    // Trigger Qunit async completion.
+                    done();
+                } );
+            } );
+        } );
+
+    } );
+
 } )( window.QUnit );