Skip to content

[Transforms] Update baselines from merging with master round 2 #8926

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.

Sign up for GitHub

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
Yui (yuit) merged 15 commits into from
Jun 2, 2016
Merged

[Transforms] Update baselines from merging with master round 2 #8926

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
187f856
update baselines from merging with master
Jun 1, 2016
ef38c3b
Correctly fix#8786
Jun 1, 2016
bf67346
Fix up linting errors
Jun 1, 2016
5cc1cd0
Fix spelling error in comment
Jun 1, 2016
d9102d1
Remove usage of null
Jun 2, 2016
306a9f0
Revert "Remove usage of null"
Jun 2, 2016
99b3167
Disable using null in unittest as we use null to signal to not genera…
Jun 2, 2016
1d7b415
Merge branch 'transforms' into transforms_updatebaselines2
Jun 2, 2016
1f0a5ac
Merge branch 'transforms' into transforms_updatebaselines2
Jun 2, 2016
6353680
Merge branch 'transforms_updatebaselines2' of https://github.com/Micr…
Jun 2, 2016
27945f8
Remove setting disable comment as we already done so in createComment…
Jun 2, 2016
df1b3ab
Address linting
Jun 2, 2016
5bbf3c7
Fix travis failure
Jun 2, 2016
52c3eea
Fix travis failure
Jun 2, 2016
dd74d28
Merge branch 'transforms_updatebaselines2' of https://github.com/Micr…
Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove usage of null
  • Loading branch information
Kanchalai Tanglertsampan
Kanchalai Tanglertsampan committed Jun 2, 2016
commit d9102d1e3f28d4f2791b7eb99c737e0004f01463
14 changes: 5 additions & 9 deletions src/harness/harness.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,15 +1678,9 @@ namespace Harness {

const actual = generateContent();

if (actual === undefined) {
throw new Error("The generated content was \"undefined\". Return \"null\" if no baselining is required.\"");
}

// Store the content in the 'local' folder so we
// can accept it later (manually)
/* tslint:disable:no-null-keyword */
if (actual !== null) {
/* tslint:enable:no-null-keyword */
if (actual !== undefined) {
IO.writeFile(actualFileName, actual);
}

Expand Down Expand Up @@ -1744,8 +1738,10 @@ namespace Harness {
else {
actual = generateActual(actualFileName, generateContent);

const comparison = compareToBaseline(actual, relativeFileName, opts);
writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
if (actual) {
const comparison = compareToBaseline(actual, relativeFileName, opts);
writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName, descriptionForDescribe);
}
}
}
catch (e) {
Expand Down