javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 22:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3379 from NativeScript/cankov/modules30-stack-layout-tests

Browse Source 
Run all stack-layout tests
This commit is contained in:
Panayot Cankov
2016-12-29 11:52:20 +02:00
committed by GitHub
parent bbc804a7b5 773e069681
commit b0e43f659a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/testRunner.ts
View File

@ -61,7 +61,7 @@ allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");
// allTests["WRAPLAYOUT"] = require("./ui/layouts/wrap-layout-tests");
// allTests["ABSOLUTELAYOUT"] = require("./ui/layouts/absolute-layout-tests");
// allTests["GRIDLAYOUT"] = require("./ui/layouts/grid-layout-tests");
// allTests["STACKLAYOUT"] = require("./ui/layouts/stack-layout-tests");
allTests["STACKLAYOUT"] = require("./ui/layouts/stack-layout-tests");
// allTests["FLEXBOXLAYOUT"] = require("./ui/layouts/flexbox-layout-tests");
// allTests["STYLE-PROPERTIES"] = require("./ui/styling/style-properties-tests");
// allTests["FRAME"] = require("./ui/frame/frame-tests");

2
tests/app/ui/layouts/stack-layout-tests.ts
View File

@ -136,7 +136,7 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
private assertChildTexts(expected, layout, message) {
let texts: Array<string> = [];
layout._eachChildView((child: { text: string }) => texts.push(child.text));
layout.eachChildView((child: { text: string }) => texts.push(child.text));
TKUnit.assertEqual(expected, texts.join('|'), message);
}

8
tns-core-modules/ui/core/view-common.ts
View File

@ -1336,10 +1336,10 @@ function parseThickness(value: string): Thickness {
function convertToMargins(this: void, value: string): [CssProperty<any, any>, any][] {
let thickness = parseThickness(value);
return [
[marginTopProperty, Length.parse(thickness.top)],
[marginRightProperty, Length.parse(thickness.right)],
[marginBottomProperty, Length.parse(thickness.bottom)],
[marginLeftProperty, Length.parse(thickness.left)]
[marginTopProperty, PercentLength.parse(thickness.top)],
[marginRightProperty, PercentLength.parse(thickness.right)],
[marginBottomProperty, PercentLength.parse(thickness.bottom)],
[marginLeftProperty, PercentLength.parse(thickness.left)]
];
}