colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-14 14:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:280north/cappuccino

Browse Source
This commit is contained in:
Alexander Ljungberg
2011-06-06 00:11:23 -04:00
parent 485e59b5eb fa0a4d3b56
commit 551aa300ea
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/AppKit/CGContextTest.j
+10 -1
View File
@@ -8,12 +8,18 @@
/*
Ensure that we have no canvas nor vml support.
*/
[self assert:YES equals:!CPFeatureIsCompatible(CPHTMLCanvasFeature)];
if (system.engine !== "jsc")
{
[self assert:YES equals:!CPFeatureIsCompatible(CPHTMLCanvasFeature)];
}
[self assert:YES equals:!CPFeatureIsCompatible(CPVMLFeature)];
}
- (void)testGStateCreate
{
if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
return;
var gstate = CGGStateCreate(),
testdata = { alpha: 1.0,
strokeStyle: "#000",
@@ -41,6 +47,9 @@
- (void)testGStateCreateCopy
{
if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
return;
var gstate = CGGStateCreate(),
gstatecopy = CGGStateCreateCopy(gstate),
testdata = { alpha: 1.0,
Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
+1 -1
View File
@@ -43,7 +43,7 @@ var CPMenuValidatedUserInterfaceItemTestValidatedItems = [];
var parentItem = [[self menu] itemWithTitle:@"parent"];
[self assertTrue:[parentItem isEnabled] message:@"Parent items should never be disabled"];
[self assertFalse:[[[self menuTarget] validatedItems] containsObject:parent] message:@"Parent items should never be validated"];
[self assertFalse:[[[self menuTarget] validatedItems] containsObject:parentItem] message:@"Parent items should never be validated"];
}
@end
Tools/Scripts/ci.sh
+2 -2
View File
@@ -7,7 +7,7 @@ export PATH="$HOME/narwhal/bin:$PATH"
export CAPP_AUTO_UPGRADE="yes"
export CAPP_BUILD="$project_home/build_incremental"
time jake test
time jake CommonJS test-only
code=$?
if [ $code -ne 0 ]; then
echo "INCREMENTAL BUILD FAILED ($code)"
@@ -19,7 +19,7 @@ fi
export CAPP_BUILD="$project_home/build_clean"
rm -rf "$CAPP_BUILD"
time jake CommonJS test
time jake CommonJS test-only
code=$?
if [ $code -ne 0 ]; then
echo "CLEAN BUILD FAILED ($code)"