Changeset 4189

Timestamp:

09/07/09 06:02:32 (4 years ago)

Author:

garry.yao

Message:

Fixing #4375: Adding manual test runner.

Location:

CKTester

Files:

• cell.js (modified) (2 diffs)
• fort.js (modified) (2 diffs)
• runners/manual (added)
• runners/manual/manual.js (added)
• runners/manual/scripts.html (added)
• runners/manual/tracwiki.js (added)
• runners/manual/yui-resize.css (added)

CKTester/cell.js

@@ -40 +40 @@
         }
 
-        var mode = ( runnerWindow == opener ) ? 'standalone' : 'managed',
-                runner = runnerWindow.CKTESTER.fort,
+        var runner = runnerWindow.CKTESTER.fort,
                 cell = runner.currentCell,
+                mode = ( runnerWindow == opener ) ? cell.mode : 'managed',
                 dependencies = cell && cell.environment;
 
@@ -62 +62 @@
                         cell :
                         {
-                                getAbsolutePath : runnerWindow.Function.prototype.curry.call(
-                                                 runnerWindow.CKTESTER.fort.getAbsolutePath, window ),
+                                getAbsolutePath : function ( path, isRelativeToFort )
+                                {
+                                        return runnerWindow.CKTESTER.fort.getAbsolutePath( isRelativeToFort == true ? null : window, path );
+                                },
 
                                 start : mode == 'managed' ?

CKTester/fort.js

@@ -180 +180 @@
                 runCell : function()
                 {
-                        this.currentCell = this.pendingCells.shift();
-                        this.currentCell && this.testFrame.setAttribute( 'src', this.currentCell.path + '.html' );
-                },
-
-                runSingleCell : function( cell )
+                        var cell = ( this.currentCell = this.pendingCells.shift() ),
+                                inNewWindow = cell && cell.tags.indexOf( 'manual' ) != -1;
+                        if( cell )
+                                // Force new window + managed mode for cells with manual tag.
+                                inNewWindow ?
+                                        this.runSingleCell( this.currentCell, 'managed' )
+                                        : this.testFrame.setAttribute( 'src', this.currentCell.path + '.html' );
+                },
+
+                runSingleCell : function( cell, mode )
                 {
                         this.currentCell = cell;
+                        cell.mode = mode || 'standalone';
                         // Open the test frame in a new popup window.
                         window.open( cell.path + '.html' );
@@ -334 +340 @@
                                                                   'runners/yuitest/extension.js',
                                                                   'runners/yuitest/test.js' ] );
+
+                                // Manual testing environments.
+                                if( tags.indexOf( 'manual' ) != -1 )
+                                        env = env.concat( [ 'runners/manual/yui-resize.css',
+                                                                                'runners/manual/yui-resize.js',
+                                                                                'runners/manual/manual.js' ] );
+
                                 if ( tags.indexOf( 'selenium' ) != -1 )
                                         env = env.concat( [ 'runners/selenium/selenium.js',