Comparing version 0.2.2 to 0.2.3
@@ -47,7 +47,8 @@ /** | ||
this.add( | ||
'define("amber/_init", ["' + this.ids.join('","') + '"], function (boot) {', | ||
'boot.vm.initialize();', | ||
'define("app", ["' + this.ids.join('","') + '"], function (boot) {', | ||
'boot.api = boot.api || boot.vm; // backward compatibility', | ||
'boot.api.initialize();', | ||
realWork, | ||
'});', | ||
'requirejs(["amber/_init"]);' | ||
'requirejs(["app"]);' | ||
); | ||
@@ -373,3 +374,3 @@ }, | ||
// store the generated smalltalk env in configuration.{core,globals} | ||
builder.finish('configuration.core = boot.vm; configuration.globals = boot.globals;'); | ||
builder.finish('configuration.core = boot.api; configuration.globals = boot.globals;'); | ||
loadIds.forEach(function (id) { | ||
@@ -571,3 +572,3 @@ builder.add('requirejs("' + id + '");'); | ||
var mainFunctionOrFile = 'var $core = boot.vm, $globals = boot.globals;\n'; | ||
var mainFunctionOrFile = 'var $core = boot.api, $globals = boot.globals;\n'; | ||
@@ -574,0 +575,0 @@ if (undefined !== configuration.main) { |
259
lib/Test.js
@@ -1,9 +0,11 @@ | ||
define("amber_core/Test", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_vm/globals", "amber_core/Kernel-Objects"], function(smalltalk,nil,_st, globals){ | ||
smalltalk.addPackage('Test'); | ||
smalltalk.packages["Test"].transport = {"type":"amd","amdNamespace":"amber_core"}; | ||
define("amber_core/Test", ["amber/boot", "amber_core/Kernel-Objects"], function($boot){ | ||
var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals; | ||
var smalltalk=$core,_st=$recv,globals=$globals; | ||
$core.addPackage('Test'); | ||
$core.packages["Test"].transport = {"type":"amd","amdNamespace":"amber_core"}; | ||
smalltalk.addClass('NodeTestRunner', globals.Object, [], 'Test'); | ||
$core.addClass('NodeTestRunner', $globals.Object, [], 'Test'); | ||
smalltalk.addMethod( | ||
smalltalk.method({ | ||
$core.addMethod( | ||
$core.method({ | ||
selector: "main", | ||
@@ -13,14 +15,22 @@ protocol: 'not yet classified', | ||
var self=this; | ||
return smalltalk.withContext(function($ctx1) { | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
return $core.withContext(function($ctx1) { | ||
//>>excludeEnd("ctx"); | ||
self._runTestSuite(); | ||
return self}, function($ctx1) {$ctx1.fill(self,"main",{},globals.NodeTestRunner.klass)})}, | ||
return self; | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
}, function($ctx1) {$ctx1.fill(self,"main",{},$globals.NodeTestRunner.klass)}); | ||
//>>excludeEnd("ctx"); | ||
}, | ||
//>>excludeStart("ide", pragmas.excludeIdeData); | ||
args: [], | ||
source: "main\x0a\x09self runTestSuite", | ||
messageSends: ["runTestSuite"], | ||
referencedClasses: [] | ||
referencedClasses: [], | ||
//>>excludeEnd("ide"); | ||
messageSends: ["runTestSuite"] | ||
}), | ||
globals.NodeTestRunner.klass); | ||
$globals.NodeTestRunner.klass); | ||
smalltalk.addMethod( | ||
smalltalk.method({ | ||
$core.addMethod( | ||
$core.method({ | ||
selector: "runTestSuite", | ||
@@ -31,115 +41,204 @@ protocol: 'not yet classified', | ||
var suite,worker; | ||
function $OrderedCollection(){return globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)} | ||
function $TestCase(){return globals.TestCase||(typeof TestCase=="undefined"?nil:TestCase)} | ||
function $TestSuiteRunner(){return globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)} | ||
function $ResultAnnouncement(){return globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)} | ||
return smalltalk.withContext(function($ctx1) { | ||
function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)} | ||
function $TestCase(){return $globals.TestCase||(typeof TestCase=="undefined"?nil:TestCase)} | ||
function $TestSuiteRunner(){return $globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)} | ||
function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)} | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
return $core.withContext(function($ctx1) { | ||
//>>excludeEnd("ctx"); | ||
var $2,$1,$3,$9,$8,$12,$11,$10,$7,$6,$15,$14,$13,$5,$4,$17,$16,$19,$18,$26,$25,$24,$23,$22,$28,$27,$21,$20,$30,$29,$32,$31,$39,$38,$37,$36,$35,$34,$33; | ||
suite=_st($OrderedCollection())._new(); | ||
_st(_st(_st($TestCase())._allSubclasses())._select_((function(each){ | ||
return smalltalk.withContext(function($ctx2) { | ||
return _st(_st(each)._isAbstract())._not(); | ||
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)})})))._do_((function(each){ | ||
return smalltalk.withContext(function($ctx2) { | ||
return _st(suite)._addAll_(_st(each)._buildSuite()); | ||
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)})})); | ||
worker=_st($TestSuiteRunner())._on_(suite); | ||
_st(_st(worker)._announcer())._on_do_($ResultAnnouncement(),(function(ann){ | ||
suite=$recv($OrderedCollection())._new(); | ||
$recv($recv($recv($TestCase())._allSubclasses())._select_((function(each){ | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
return $core.withContext(function($ctx2) { | ||
//>>excludeEnd("ctx"); | ||
return $recv($recv(each)._isAbstract())._not(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)}); | ||
//>>excludeEnd("ctx"); | ||
})))._do_((function(each){ | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
return $core.withContext(function($ctx2) { | ||
//>>excludeEnd("ctx"); | ||
return $recv(suite)._addAll_($recv(each)._buildSuite()); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)}); | ||
//>>excludeEnd("ctx"); | ||
})); | ||
worker=$recv($TestSuiteRunner())._on_(suite); | ||
$recv($recv(worker)._announcer())._on_do_($ResultAnnouncement(),(function(ann){ | ||
var result; | ||
return smalltalk.withContext(function($ctx2) { | ||
result=_st(ann)._result(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
return $core.withContext(function($ctx2) { | ||
//>>excludeEnd("ctx"); | ||
result=$recv(ann)._result(); | ||
result; | ||
$2=_st(result)._runs(); | ||
$2=$recv(result)._runs(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["runs"]=1; | ||
$1=_st($2).__eq(_st(result)._total()); | ||
if(smalltalk.assert($1)){ | ||
//>>excludeEnd("ctx"); | ||
$1=$recv($2).__eq($recv(result)._total()); | ||
if($core.assert($1)){ | ||
$3=console; | ||
$9=_st(_st(result)._runs())._asString(); | ||
$9=$recv($recv(result)._runs())._asString(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["asString"]=1; | ||
$8=_st($9).__comma(" tests run, "); | ||
//>>excludeEnd("ctx"); | ||
$8=$recv($9).__comma(" tests run, "); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=5; | ||
$12=_st(result)._failures(); | ||
//>>excludeEnd("ctx"); | ||
$12=$recv(result)._failures(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["failures"]=1; | ||
$11=_st($12)._size(); | ||
//>>excludeEnd("ctx"); | ||
$11=$recv($12)._size(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["size"]=1; | ||
$10=_st($11)._asString(); | ||
//>>excludeEnd("ctx"); | ||
$10=$recv($11)._asString(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["asString"]=2; | ||
$7=_st($8).__comma($10); | ||
//>>excludeEnd("ctx"); | ||
$7=$recv($8).__comma($10); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=4; | ||
$6=_st($7).__comma(" failures, "); | ||
//>>excludeEnd("ctx"); | ||
$6=$recv($7).__comma(" failures, "); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=3; | ||
$15=_st(result)._errors(); | ||
//>>excludeEnd("ctx"); | ||
$15=$recv(result)._errors(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["errors"]=1; | ||
$14=_st($15)._size(); | ||
$13=_st($14)._asString(); | ||
$5=_st($6).__comma($13); | ||
//>>excludeEnd("ctx"); | ||
$14=$recv($15)._size(); | ||
$13=$recv($14)._asString(); | ||
$5=$recv($6).__comma($13); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=2; | ||
$4=_st($5).__comma(" errors."); | ||
//>>excludeEnd("ctx"); | ||
$4=$recv($5).__comma(" errors."); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=1; | ||
_st($3)._log_($4); | ||
$17=_st(result)._failures(); | ||
//>>excludeEnd("ctx"); | ||
$recv($3)._log_($4); | ||
$17=$recv(result)._failures(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["failures"]=2; | ||
$16=_st($17)._isEmpty(); | ||
//>>excludeEnd("ctx"); | ||
$16=$recv($17)._isEmpty(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["isEmpty"]=1; | ||
if(! smalltalk.assert($16)){ | ||
$19=_st(result)._failures(); | ||
//>>excludeEnd("ctx"); | ||
if(!$core.assert($16)){ | ||
$19=$recv(result)._failures(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["failures"]=3; | ||
$18=_st($19)._first(); | ||
//>>excludeEnd("ctx"); | ||
$18=$recv($19)._first(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["first"]=1; | ||
_st($18)._runCase(); | ||
//>>excludeEnd("ctx"); | ||
$recv($18)._runCase(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["runCase"]=1; | ||
$26=_st(result)._failures(); | ||
//>>excludeEnd("ctx"); | ||
$26=$recv(result)._failures(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["failures"]=4; | ||
$25=_st($26)._first(); | ||
//>>excludeEnd("ctx"); | ||
$25=$recv($26)._first(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["first"]=2; | ||
$24=_st($25)._class(); | ||
//>>excludeEnd("ctx"); | ||
$24=$recv($25)._class(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["class"]=1; | ||
$23=_st($24)._name(); | ||
//>>excludeEnd("ctx"); | ||
$23=$recv($24)._name(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["name"]=1; | ||
$22=_st($23).__comma(" >> "); | ||
//>>excludeEnd("ctx"); | ||
$22=$recv($23).__comma(" >> "); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=8; | ||
$28=_st(_st(result)._failures())._first(); | ||
//>>excludeEnd("ctx"); | ||
$28=$recv($recv(result)._failures())._first(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["first"]=3; | ||
$27=_st($28)._selector(); | ||
//>>excludeEnd("ctx"); | ||
$27=$recv($28)._selector(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["selector"]=1; | ||
$21=_st($22).__comma($27); | ||
//>>excludeEnd("ctx"); | ||
$21=$recv($22).__comma($27); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=7; | ||
$20=_st($21).__comma(" is failing!"); | ||
//>>excludeEnd("ctx"); | ||
$20=$recv($21).__comma(" is failing!"); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=6; | ||
//>>excludeEnd("ctx"); | ||
self._throw_($20); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["throw:"]=1; | ||
//>>excludeEnd("ctx"); | ||
}; | ||
$30=_st(result)._errors(); | ||
$30=$recv(result)._errors(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["errors"]=2; | ||
$29=_st($30)._isEmpty(); | ||
if(! smalltalk.assert($29)){ | ||
$32=_st(result)._errors(); | ||
//>>excludeEnd("ctx"); | ||
$29=$recv($30)._isEmpty(); | ||
if(!$core.assert($29)){ | ||
$32=$recv(result)._errors(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["errors"]=3; | ||
$31=_st($32)._first(); | ||
//>>excludeEnd("ctx"); | ||
$31=$recv($32)._first(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["first"]=4; | ||
_st($31)._runCase(); | ||
$39=_st(result)._errors(); | ||
//>>excludeEnd("ctx"); | ||
$recv($31)._runCase(); | ||
$39=$recv(result)._errors(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["errors"]=4; | ||
$38=_st($39)._first(); | ||
//>>excludeEnd("ctx"); | ||
$38=$recv($39)._first(); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx["first"]=5; | ||
$37=_st($38)._class(); | ||
$36=_st($37)._name(); | ||
$35=_st($36).__comma(" >> "); | ||
$34=_st($35).__comma(_st(_st(_st(result)._errors())._first())._selector()); | ||
//>>excludeEnd("ctx"); | ||
$37=$recv($38)._class(); | ||
$36=$recv($37)._name(); | ||
$35=$recv($36).__comma(" >> "); | ||
$34=$recv($35).__comma($recv($recv($recv(result)._errors())._first())._selector()); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=10; | ||
$33=_st($34).__comma(" has errors!"); | ||
//>>excludeEnd("ctx"); | ||
$33=$recv($34).__comma(" has errors!"); | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
$ctx2.sendIdx[","]=9; | ||
//>>excludeEnd("ctx"); | ||
return self._throw_($33); | ||
}; | ||
}; | ||
}, function($ctx2) {$ctx2.fillBlock({ann:ann,result:result},$ctx1,3)})})); | ||
_st(worker)._run(); | ||
return self}, function($ctx1) {$ctx1.fill(self,"runTestSuite",{suite:suite,worker:worker},globals.NodeTestRunner.klass)})}, | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
}, function($ctx2) {$ctx2.fillBlock({ann:ann,result:result},$ctx1,3)}); | ||
//>>excludeEnd("ctx"); | ||
})); | ||
$recv(worker)._run(); | ||
return self; | ||
//>>excludeStart("ctx", pragmas.excludeDebugContexts); | ||
}, function($ctx1) {$ctx1.fill(self,"runTestSuite",{suite:suite,worker:worker},$globals.NodeTestRunner.klass)}); | ||
//>>excludeEnd("ctx"); | ||
}, | ||
//>>excludeStart("ide", pragmas.excludeIdeData); | ||
args: [], | ||
source: "runTestSuite\x0a\x09| suite worker |\x0a\x0a\x09suite := OrderedCollection new.\x0a (TestCase allSubclasses select: [ :each | each isAbstract not ])\x0a\x09do: [ :each | suite addAll: each buildSuite ].\x0a\x0a\x09worker := TestSuiteRunner on: suite.\x0a\x09worker announcer on: ResultAnnouncement do:\x0a\x09[ :ann | | result |\x0a \x09result := ann result.\x0a result runs = result total ifTrue: [\x0a\x09 console log: result runs asString, ' tests run, ', result failures size asString, ' failures, ', result errors size asString, ' errors.'.\x0a\x0a result failures isEmpty ifFalse: [\x0a result failures first runCase.\x0a \x22the line above should throw, normally, but just in case I leave the line below\x22\x0a self throw: result failures first class name, ' >> ', result failures first selector, ' is failing!' ].\x0a result errors isEmpty ifFalse: [\x0a result errors first runCase.\x0a \x22the line above should throw, normally, but just in case I leave the line below\x22\x0a self throw: result errors first class name, ' >> ', result errors first selector, ' has errors!' ].\x0a ]].\x0a worker run", | ||
messageSends: ["new", "do:", "select:", "allSubclasses", "not", "isAbstract", "addAll:", "buildSuite", "on:", "on:do:", "announcer", "result", "ifTrue:", "=", "runs", "total", "log:", ",", "asString", "size", "failures", "errors", "ifFalse:", "isEmpty", "runCase", "first", "throw:", "name", "class", "selector", "run"], | ||
referencedClasses: ["OrderedCollection", "TestCase", "TestSuiteRunner", "ResultAnnouncement"] | ||
referencedClasses: ["OrderedCollection", "TestCase", "TestSuiteRunner", "ResultAnnouncement"], | ||
//>>excludeEnd("ide"); | ||
messageSends: ["new", "do:", "select:", "allSubclasses", "not", "isAbstract", "addAll:", "buildSuite", "on:", "on:do:", "announcer", "result", "ifTrue:", "=", "runs", "total", "log:", ",", "asString", "size", "failures", "errors", "ifFalse:", "isEmpty", "runCase", "first", "throw:", "name", "class", "selector", "run"] | ||
}), | ||
globals.NodeTestRunner.klass); | ||
$globals.NodeTestRunner.klass); | ||
}); |
{ | ||
"name": "amber-dev", | ||
"version": "0.2.2", | ||
"version": "0.2.3", | ||
"description": "Development goodies for Amber Smalltalk", | ||
@@ -18,6 +18,6 @@ "scripts": { | ||
"dependencies": { | ||
"amd-config-builder": "^0.2.0", | ||
"amdefine": "0.0.8", | ||
"es6-promise": "^0.1.1", | ||
"amd-config-builder": "^0.2.0" | ||
"es6-promise": "^2.0.0" | ||
} | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
36648
967
+ Addedes6-promise@2.3.0(transitive)
- Removedes6-promise@0.1.2(transitive)
Updatedes6-promise@^2.0.0