Changeset 30919

Timestamp:

12/16/2014 07:43:22 PM (10 years ago)

Author:

ocean90

Message:

Customizer: Add more QUnit tests to improve coverage on the new models.

Includes tests for the broken activate()/deactivate() methods, which were fixed in [30871].

props westonruter.
see #30701.

Location:

trunk/tests/qunit

Files:

• fixtures/customize-settings.js (added)
• index.html (modified) (1 diff)
• wp-admin/js/customize-controls.js (modified) (4 diffs)

trunk/tests/qunit/index.html

@@ -24 +24 @@
     <div id="qunit-fixture">
       <script src="fixtures/customize-header.js"></script>
+      <script src="fixtures/customize-settings.js"></script>
     </div>
     <p><a href="editor">TinyMCE tests</a></p>

trunk/tests/qunit/wp-admin/js/customize-controls.js

@@ -1 +1 @@
 /* global wp */
 
-jQuery( function() {
+jQuery( window ).load( function (){
+    'use strict';
 
     var controlId, controlLabel, controlType, controlContent, controlDescription, controlData, mockControl,
         mockControlInstance, controlExpectedValues, sectionId, sectionContent, sectionData, mockSection,
         sectionInstance, sectionExpectedValues, panelId, panelTitle, panelDescription, panelContent, panelData,
-        mockPanel, panelExpectedValues, testCustomizerModel;
+        mockPanel, panelExpectedValues, testCustomizerModel, settingId, settingValue, mockSetting;
 
     testCustomizerModel = function( model, expectedValues ) {
-        var type =  expectedValues.type || '';
+        if ( ! expectedValues.type || ! wp.customize[ expectedValues.type ] ) {
+            throw new Error( 'Must pass value type in expectedValues.' );
+        }
+        var type = expectedValues.type;
+        test( 'Model extends proper type', function () {
+            ok( model.extended( wp.customize[ type ] ) );
+        } );
 
         if ( expectedValues.hasOwnProperty( 'id' ) ) {
-            test( type + ' instance has the right id' , function () {
-                equal( model.id , expectedValues.id );
+            test( type + ' instance has the right id', function () {
+                equal( model.id, expectedValues.id );
             });
         }
         if ( expectedValues.hasOwnProperty( 'title') ) {
             test( type + ' instance has the right title.', function () {
-                equal( model.params.title , expectedValues.title );
+                equal( model.params.title, expectedValues.title );
             });
         }
         if ( expectedValues.hasOwnProperty( 'description' ) ) {
             test( type + ' instance has the right description.', function () {
-                equal( model.params.description , expectedValues.description );
+                equal( model.params.description, expectedValues.description );
             });
         }
         if ( expectedValues.hasOwnProperty( 'content' ) ) {
             test( type + ' instance has the right content.', function () {
-                equal( model.params.content , expectedValues.content );
+                equal( model.params.content, expectedValues.content );
             });
         }
         if ( expectedValues.hasOwnProperty( 'priority' ) ) {
             test( type + ' instance has the right priority.', function () {
-                equal( model.priority() , expectedValues.priority );
-            });
-        }
-        if ( expectedValues.textExpanded ) {
-            test( type + ' instance is not expanded', function () {
-                equal( model.expanded() , false );
-            });
-
-            test( type + ' instance is expanded after calling .expanded()', function () {
+                equal( model.priority(), expectedValues.priority );
+            });
+        }
+        if ( expectedValues.hasOwnProperty( 'active' ) ) {
+            test( type + ' instance has the right active state.', function () {
+                equal( model.active(), expectedValues.active );
+            });
+        }
+        test( type + ' can be deactivated', function () {
+            model.activate();
+            model.deactivate();
+            equal( model.active(), false );
+            model.activate();
+            equal( model.active(), true );
+            ok(true);
+        });
+
+        if ( type === 'Panel' || type === 'Section' ) {
+            if ( expectedValues.hasOwnProperty( 'expanded' ) ) {
+                test( type + ' instance has the right expanded state.', function () {
+                    equal( model.expanded(), expectedValues.expanded );
+                } );
+            }
+
+            test( type + ' instance is collapsed after calling .collapse()', function () {
+                model.collapse();
+                ok( ! model.expanded() );
+            });
+
+            test( type + ' instance is expanded after calling .expand()', function () {
                 model.expand();
                 ok( model.expanded() );
             });
-
-            test( type + ' instance is collapsed after calling .collapse()', function () {
-                model.collapse();
-                equal( model.expanded() , false );
-            });
-        }
-
-    };
-
-
-    module( 'Customizer Control Model' );
+        }
+
+    };
+
+    module( 'Customizer Setting in Fixture' );
+    test( 'Setting has fixture value', function () {
+        equal( wp.customize( 'fixture-setting' )(), 'Lorem Ipsum' );
+    } );
+
+    module( 'Customizer Control in Fixture' );
+    test( 'Control exists', function () {
+        ok( wp.customize.control.has( 'fixture-control' ) );
+    } );
+    test( 'Control has the fixture setting', function () {
+        var control = wp.customize.control( 'fixture-control' );
+        equal( control.setting(), 'Lorem Ipsum' );
+        equal( control.setting.id, 'fixture-setting' );
+    } );
+    test( 'Control has the section fixture section ID', function () {
+        var control = wp.customize.control( 'fixture-control' );
+        equal( control.section(), 'fixture-section' );
+    } );
+
+    module( 'Customizer Section in Fixture' );
+    test( 'Fixture section exists', function () {
+        ok( wp.customize.section.has( 'fixture-section' ) );
+    } );
+    test( 'Fixture section has control among controls()', function () {
+        var section = wp.customize.section( 'fixture-section' );
+        equal( section.controls().length, 1 );
+        equal( section.controls()[0].id, 'fixture-control' );
+    } );
+    test( 'Fixture section has control among controls()', function () {
+        var section = wp.customize.section( 'fixture-section' );
+        equal( section.panel(), 'fixture-panel' );
+    } );
+
+    module( 'Customizer Panel in Fixture' );
+    test( 'Fixture panel exists', function () {
+        ok( wp.customize.panel.has( 'fixture-panel' ) );
+    } );
+    test( 'Fixture section has control among controls()', function () {
+        var panel = wp.customize.panel( 'fixture-panel' );
+        equal( panel.sections().length, 1 );
+        equal( panel.sections()[0].id, 'fixture-section' );
+    } );
+    test( 'Panel is not expanded by default', function () {
+        var panel = wp.customize.panel( 'fixture-panel' );
+        ok( ! panel.expanded() );
+    } );
+    test( 'Panel is not expanded by default', function () {
+        var panel = wp.customize.panel( 'fixture-panel' );
+        ok( ! panel.expanded() );
+    } );
+    test( 'Focusing on a control will expand the panel and section', function () {
+        var panel, section, control;
+        panel = wp.customize.panel( 'fixture-panel' );
+        section = wp.customize.section( 'fixture-section' );
+        control = wp.customize.control( 'fixture-control' );
+        ok( ! panel.expanded() );
+        ok( ! section.expanded() );
+        control.focus();
+        ok( section.expanded() );
+        ok( panel.expanded() );
+    } );
+
+
+    module( 'Dynamically-created Customizer Setting Model' );
+    settingId = 'new_blogname';
+    settingValue = 'Hello World';
+
+    test( 'Create a new setting', function () {
+        mockSetting = wp.customize.create(
+            settingId,
+            settingId,
+            settingValue,
+            {
+                transport: 'refresh',
+                previewer: wp.customize.previewer
+            }
+        );
+        equal( mockSetting(), settingValue );
+        equal( mockSetting.id, settingId );
+    } );
+
+    module( 'Dynamically-created Customizer Section Model' );
+
+    sectionId = 'mock_title_tagline';
+    sectionContent = '<li id="accordion-section-mock_title_tagline" class="control-section accordion-section"></li>';
+    sectionData = {
+        content: sectionContent,
+        active: true
+    };
+
+    mockSection = new wp.customize.Section( sectionId, { params: sectionData } );
+
+    sectionExpectedValues = {
+        type: 'Section',
+        id: sectionId,
+        content: sectionContent,
+        priority: 100,
+        active: true // @todo This should default to true
+    };
+
+    testCustomizerModel( mockSection, sectionExpectedValues );
+
+    test( 'Section has been embedded', function () {
+        equal( mockSection.deferred.embedded.state(), 'resolved' );
+    } );
+
+    wp.customize.section.add( sectionId, mockSection );
+
+    test( 'Section instance added to the wp.customize.section object', function () {
+        ok( wp.customize.section.has( sectionId ) );
+    });
+
+    sectionInstance = wp.customize.section( sectionId );
+
+    test( 'Section instance has right content when accessed from wp.customize.section()', function () {
+        equal( sectionInstance.params.content, sectionContent );
+    });
+
+    test( 'Section instance has no children yet', function () {
+        equal( sectionInstance.controls().length, 0 );
+    });
+
+    module( 'Dynamically-created Customizer Control Model' );
 
     controlId = 'new_blogname';
@@ -64 +208 @@
 
     controlData = {
-        content : controlContent,
-        description : controlDescription,
-        label : controlLabel,
-        settings : { 'default' : 'blogname' },
-        type : controlType
-    };
-
-    mockControl = new wp.customize.Control( controlId , {
-        params : controlData,
-        previewer : wp.customize.previewer
+        content: controlContent,
+        description: controlDescription,
+        label: controlLabel,
+        settings: { 'default': 'new_blogname' },
+        type: controlType,
+        active: true // @todo This should default to true
+    };
+
+    mockControl = new wp.customize.Control( controlId, {
+        params: controlData,
+        previewer: wp.customize.previewer
     });
 
     controlExpectedValues = {
-        type : 'Control',
-        content : controlContent,
-        descrption : controlDescription,
-        label : controlLabel,
-        id : controlId,
-        priority : 10,
-        textExpanded : false
-    };
-
-    testCustomizerModel( mockControl , controlExpectedValues );
+        type: 'Control',
+        content: controlContent,
+        description: controlDescription,
+        label: controlLabel,
+        id: controlId,
+        priority: 10
+    };
+
+    testCustomizerModel( mockControl, controlExpectedValues );
 
     test( 'Control instance does not yet belong to a section.', function () {
-        equal( mockControl.section() , undefined );
-    });
+        equal( mockControl.section(), undefined );
+    });
+    test( 'Control has not been embedded yet', function () {
+        equal( mockControl.deferred.embedded.state(), 'pending' );
+    } );
 
     test( 'Control instance has the right selector.', function () {
-        equal( mockControl.selector , '#customize-control-new_blogname' );
-    });
-
-    wp.customize.control.add( controlId , mockControl );
+        equal( mockControl.selector, '#customize-control-new_blogname' );
+    });
+
+    wp.customize.control.add( controlId, mockControl );
 
     test( 'Control instance was added to the control class.', function () {
@@ -105 +252 @@
 
     test( 'Control instance has the right id when accessed from api.control().', function () {
-        equal( mockControlInstance.id , controlId );
-    });
-
-
-    module( 'Customizer Section Model' );
-
-    sectionId = 'mock_title_tagline';
-    sectionContent = '<li id="accordion-section-title_tagline" class="control-section accordion-section"></li>';
-    sectionData = {
-        content : sectionContent
-    };
-
-    mockSection = new wp.customize.Section( sectionId , { params : sectionData } );
-
-    sectionExpectedValues = {
-        type : 'Section',
-        id : sectionId,
-        content : sectionContent,
-        priority : 100,
-        testExpanded : true
-    };
-
-    testCustomizerModel( mockSection , sectionExpectedValues );
-
-    wp.customize.section.add( sectionId , mockSection );
-
-    test( 'Section instance added to the wp.customize.section object', function () {
-        ok( wp.customize.section.has( sectionId ) );
-    });
-
-    sectionInstance = wp.customize.section( sectionId );
-
-    test( 'Section instance has right content when accessed from wp.customize.section()', function () {
-        equal( sectionInstance.params.content , sectionContent );
-    });
-
-
-    module( 'Customizer Panel Model' );
+        equal( mockControlInstance.id, controlId );
+    });
+
+    test( 'Control section can be set as expected', function () {
+        mockControl.section( mockSection.id );
+        equal( mockControl.section(), mockSection.id );
+    });
+    test( 'Associating a control with a section allows it to be embedded', function () {
+        equal( mockControl.deferred.embedded.state(), 'resolved' );
+    });
+
+    test( 'Control is now available on section.controls()', function () {
+        equal( sectionInstance.controls().length, 1 );
+        equal( sectionInstance.controls()[0], mockControl );
+    });
+
+    module( 'Dynamically-created Customizer Panel Model' );
 
     panelId = 'mockPanelId';
@@ -149 +275 @@
     panelContent = '<li id="accordion-panel-widgets" class="control-section control-panel accordion-section">';
     panelData = {
-        content : panelContent,
-        title : panelTitle,
-        description : panelDescription
-    };
-
-    mockPanel = new wp.customize.Panel( panelId , { params : panelData } );
+        content: panelContent,
+        title: panelTitle,
+        description: panelDescription,
+        active: true // @todo This should default to true
+    };
+
+    mockPanel = new wp.customize.Panel( panelId, { params: panelData } );
 
     panelExpectedValues = {
-        type : 'Panel',
-        id : panelId,
-        title : panelTitle ,
-        description : panelDescription,
-        content : panelContent,
-        priority : 100,
-        testExpanded : true
-    };
-
-    testCustomizerModel( mockPanel , panelExpectedValues );
+        type: 'Panel',
+        id: panelId,
+        title: panelTitle,
+        description: panelDescription,
+        content: panelContent,
+        priority: 100,
+        active: true
+    };
+
+    testCustomizerModel( mockPanel, panelExpectedValues );
 
     test( 'Panel instance is not contextuallyActive', function () {
-        equal( mockPanel.isContextuallyActive() , false );
+        equal( mockPanel.isContextuallyActive(), false );
     });
 });