|
@@ -1,13 +1,15 @@
|
|
|
-define("silk/Silk-Tests", ["amber/boot"
|
|
|
+define(["amber/boot"
|
|
|
//>>excludeStart("imports", pragmas.excludeImports);
|
|
|
, "amber/jquery/Wrappers-JQuery"
|
|
|
//>>excludeEnd("imports");
|
|
|
-, "domite/DOMite-Tests", "amber_core/SUnit"], function($boot
|
|
|
+, "amber_core/SUnit", "domite/DOMite-Tests"], function($boot
|
|
|
//>>excludeStart("imports", pragmas.excludeImports);
|
|
|
|
|
|
//>>excludeEnd("imports");
|
|
|
){"use strict";
|
|
|
-var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
|
|
|
+if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
|
|
|
+var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
|
|
|
+if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
|
|
|
$core.addPackage('Silk-Tests');
|
|
|
$core.packages["Silk-Tests"].innerEval = function (expr) { return eval(expr); };
|
|
|
$core.packages["Silk-Tests"].imports = ["amber/jquery/Wrappers-JQuery"];
|
|
@@ -20,8 +22,7 @@ selector: "testedClass",
|
|
|
protocol: 'fixture',
|
|
|
fn: function (){
|
|
|
var self=this;
|
|
|
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
|
|
|
-return $Silk();
|
|
|
+return $globals.Silk;
|
|
|
|
|
|
},
|
|
|
//>>excludeStart("ide", pragmas.excludeIdeData);
|
|
@@ -84,11 +85,10 @@ protocol: 'fixture',
|
|
|
fn: function (aStringArray){
|
|
|
var self=this;
|
|
|
var sanitizedBody,err;
|
|
|
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
//>>excludeEnd("ctx");
|
|
|
-var $2,$3,$1,$4,$5,$receiver;
|
|
|
+var $2,$3,$1,$4,$receiver;
|
|
|
var $early={};
|
|
|
try {
|
|
|
sanitizedBody=$recv($recv($recv(document)._body())._innerHTML())._replace_with_("\x5cs*","");
|
|
@@ -116,13 +116,12 @@ $ctx3.sendIdx["size"]=2;
|
|
|
//>>excludeEnd("ctx");
|
|
|
$1=$recv($2).__gt_eq($3);
|
|
|
self._assert_($1);
|
|
|
-$4=self._assert_equals_($recv(sanitizedBody)._last_($recv(sanitizedAssertion)._size()),sanitizedAssertion);
|
|
|
-$4;
|
|
|
+self._assert_equals_($recv(sanitizedBody)._last_($recv(sanitizedAssertion)._size()),sanitizedAssertion);
|
|
|
throw $early=[self];
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
|
|
|
//>>excludeEnd("ctx");
|
|
|
-}))._on_do_($Error(),(function(e){
|
|
|
+}))._on_do_($globals.Error,(function(e){
|
|
|
err=e;
|
|
|
return err;
|
|
|
|
|
@@ -131,12 +130,12 @@ return err;
|
|
|
}, function($ctx2) {$ctx2.fillBlock({aString:aString,sanitizedAssertion:sanitizedAssertion},$ctx1,1)});
|
|
|
//>>excludeEnd("ctx");
|
|
|
}));
|
|
|
-$5=err;
|
|
|
-if(($receiver = $5) == null || $receiver.isNil){
|
|
|
-$5;
|
|
|
+$4=err;
|
|
|
+if(($receiver = $4) == null || $receiver.isNil){
|
|
|
+$4;
|
|
|
} else {
|
|
|
$recv(err)._signal();
|
|
|
-};
|
|
|
+}
|
|
|
return self;
|
|
|
}
|
|
|
catch(e) {if(e===$early)return e[0]; throw e}
|
|
@@ -222,7 +221,7 @@ var d,tbl;
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
//>>excludeEnd("ctx");
|
|
|
-var $1,$2,$3,$4;
|
|
|
+var $1,$2,$3;
|
|
|
d="html body div#fixture"._asSilk();
|
|
|
tbl=$recv(d)._TABLE();
|
|
|
$1=$recv(tbl)._TR();
|
|
@@ -250,7 +249,7 @@ $recv($3)._TD_("E");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TD:"]=5;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$4=$recv($3)._TD_("F");
|
|
|
+$recv($3)._TD_("F");
|
|
|
self._assertBodyEndsWith_(">sentinel<table><tr><td>A</td><td>B</td><td>C</td></tr><tr><td>D</td><td>E</td><td>F</td></tr></table></div>");
|
|
|
return self;
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
@@ -273,43 +272,40 @@ protocol: 'testing',
|
|
|
fn: function (){
|
|
|
var self=this;
|
|
|
var d,tbl;
|
|
|
-function $Silk(){return $globals.Silk||(typeof Silk=="undefined"?nil:Silk)}
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
//>>excludeEnd("ctx");
|
|
|
-var $1,$2,$4,$5,$6,$3,$8,$10,$11,$9,$7;
|
|
|
+var $1,$3,$4,$5,$2,$7,$8,$6;
|
|
|
d="html body div#fixture"._asSilk();
|
|
|
tbl=$recv(d)._TABLE();
|
|
|
$1=tbl;
|
|
|
-$2=$1;
|
|
|
-$4=$recv($Silk())._TD_("A");
|
|
|
+$3=$recv($globals.Silk)._TD_("A");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TD:"]=1;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$5=$recv($Silk())._TD_("B");
|
|
|
+$4=$recv($globals.Silk)._TD_("B");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TD:"]=2;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$6=$recv($Silk())._TD_("C");
|
|
|
+$5=$recv($globals.Silk)._TD_("C");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TD:"]=3;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$3=[$4,$5,$6];
|
|
|
-$recv($2)._TR_($3);
|
|
|
+$2=[$3,$4,$5];
|
|
|
+$recv($1)._TR_($2);
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TR:"]=1;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$8=$1;
|
|
|
-$10=$recv($Silk())._TD_("D");
|
|
|
+$7=$recv($globals.Silk)._TD_("D");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TD:"]=4;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$11=$recv($Silk())._TD_("E");
|
|
|
+$8=$recv($globals.Silk)._TD_("E");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
$ctx1.sendIdx["TD:"]=5;
|
|
|
//>>excludeEnd("ctx");
|
|
|
-$9=[$10,$11,$recv($Silk())._TD_("F")];
|
|
|
-$7=$recv($8)._TR_($9);
|
|
|
+$6=[$7,$8,$recv($globals.Silk)._TD_("F")];
|
|
|
+$recv($1)._TR_($6);
|
|
|
self._assertBodyEndsWith_(">sentinel<table><tr><td>A</td><td>B</td><td>C</td></tr><tr><td>D</td><td>E</td><td>F</td></tr></table></div>");
|
|
|
return self;
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
@@ -332,7 +328,6 @@ protocol: 'testing',
|
|
|
fn: function (){
|
|
|
var self=this;
|
|
|
var s;
|
|
|
-function $Transcript(){return $globals.Transcript||(typeof Transcript=="undefined"?nil:Transcript)}
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
//>>excludeEnd("ctx");
|
|
@@ -388,7 +383,7 @@ $recv($recv(s)._BUTTON_("do something"))._on_bind_("click",(function(){
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
return $core.withContext(function($ctx2) {
|
|
|
//>>excludeEnd("ctx");
|
|
|
-return $recv($Transcript())._show_("button pressed");
|
|
|
+return $recv($globals.Transcript)._show_("button pressed");
|
|
|
//>>excludeStart("ctx", pragmas.excludeDebugContexts);
|
|
|
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
|
|
|
//>>excludeEnd("ctx");
|