-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Make ConvertTo-Html work on CoreCLR #2241
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Html.Tests.ps1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| Describe "ConvertTo-Html Tests" -Tags "CI" { | ||
|
|
||
| BeforeAll { | ||
| $customObject = [pscustomobject]@{"Name" = "John Doe"; "Age" = 42; "Friends" = ("Jack", "Jill")} | ||
| $newLine = "`r`n" | ||
| } | ||
|
|
||
| function normalizeLineEnds([string]$text) | ||
| { | ||
| $text -replace "`r`n?|`n", "`r`n" | ||
| } | ||
|
|
||
| It "Test ConvertTo-Html with no parameters" { | ||
| $returnObject = $customObject | ConvertTo-Html | ||
| $returnObject -is [System.Array] | Should Be $true | ||
| $returnString = $returnObject -join $newLine | ||
| $expectedValue = normalizeLineEnds @" | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
| <title>HTML TABLE</title> | ||
| </head><body> | ||
| <table> | ||
| <colgroup><col/><col/><col/></colgroup> | ||
| <tr><th>Name</th><th>Age</th><th>Friends</th></tr> | ||
| <tr><td>John Doe</td><td>42</td><td>System.Object[]</td></tr> | ||
| </table> | ||
| </body></html> | ||
| "@ | ||
| $returnString | Should Be $expectedValue | ||
| } | ||
|
|
||
| It "Test ConvertTo-Html Fragment parameter" { | ||
| $returnString = ($customObject | ConvertTo-Html -Fragment) -join $newLine | ||
| $expectedValue = normalizeLineEnds @" | ||
| <table> | ||
| <colgroup><col/><col/><col/></colgroup> | ||
| <tr><th>Name</th><th>Age</th><th>Friends</th></tr> | ||
| <tr><td>John Doe</td><td>42</td><td>System.Object[]</td></tr> | ||
| </table> | ||
| "@ | ||
| $returnString | Should Be $expectedValue | ||
| } | ||
|
|
||
| It "Test ConvertTo-Html as List" { | ||
| $returnString = ($customObject | ConvertTo-Html -As List) -join $newLine | ||
| $expectedValue = normalizeLineEnds @" | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
| <title>HTML TABLE</title> | ||
| </head><body> | ||
| <table> | ||
| <tr><td>Name:</td><td>John Doe</td></tr> | ||
| <tr><td>Age:</td><td>42</td></tr> | ||
| <tr><td>Friends:</td><td>System.Object[]</td></tr> | ||
| </table> | ||
| </body></html> | ||
| "@ | ||
| $returnString | Should Be $expectedValue | ||
| } | ||
|
|
||
| It "Test ConvertTo-Html specified properties" { | ||
| $returnString = ($customObject | ConvertTo-Html -Property Name, Friends -As List) -join $newLine | ||
| $expectedValue = normalizeLineEnds @" | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
| <title>HTML TABLE</title> | ||
| </head><body> | ||
| <table> | ||
| <tr><td>Name:</td><td>John Doe</td></tr> | ||
| <tr><td>Friends:</td><td>System.Object[]</td></tr> | ||
| </table> | ||
| </body></html> | ||
| "@ | ||
| $returnString | Should Be $expectedValue | ||
| } | ||
|
|
||
| It "Test ConvertTo-Html using page parameters" { | ||
| $returnString = ($customObject | ConvertTo-Html -Title "Custom Object" -Body "Body Text" -CssUri "page.css" -As List) -join $newLine | ||
| $expectedValue = normalizeLineEnds @" | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
| <title>Custom Object</title> | ||
| <link rel="stylesheet" type="text/css" href="page.css" /> | ||
| </head><body> | ||
| Body Text | ||
| <table> | ||
| <tr><td>Name:</td><td>John Doe</td></tr> | ||
| <tr><td>Age:</td><td>42</td></tr> | ||
| <tr><td>Friends:</td><td>System.Object[]</td></tr> | ||
| </table> | ||
| </body></html> | ||
| "@ | ||
| $returnString | Should Be $expectedValue | ||
| } | ||
|
|
||
| It "Test ConvertTo-Html pre and post" { | ||
| $returnString = ($customObject | ConvertTo-Html -PreContent "Before the object" -PostContent "After the object") -join $newLine | ||
| $expectedValue = normalizeLineEnds @" | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| <head> | ||
| <title>HTML TABLE</title> | ||
| </head><body> | ||
| Before the object | ||
| <table> | ||
| <colgroup><col/><col/><col/></colgroup> | ||
| <tr><th>Name</th><th>Age</th><th>Friends</th></tr> | ||
| <tr><td>John Doe</td><td>42</td><td>System.Object[]</td></tr> | ||
| </table> | ||
| After the object | ||
| </body></html> | ||
| "@ | ||
| $returnString | Should Be $expectedValue | ||
| } | ||
| } | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder, why was it taking away at the first place. @daxian-dbw @andschwa ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was never taken in. I guess we just didn't get to it.