Skip to content
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

Jump to bottom

Update octicon version #1652

Merged
merged 17 commits into from
Sep 18, 2021
Merged

Update octicon version #1652

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2e8383e
Update octicon version
ong6 Aug 14, 2021
5659965
v3.0.7
ong6 Aug 15, 2021
eb12693
Revert commit
ong6 Aug 29, 2021
e19bf1f
Revert "v3.0.7"
ong6 Aug 29, 2021
55572b9
Pulled from Master
ong6 Aug 29, 2021
f89c332
Merge branch 'master' of https://github.com/ong6/markbind into octico…
ong6 Aug 29, 2021
68ffc73
Update tests
ong6 Aug 29, 2021
68b6661
Logging error to test why CI not working
ong6 Aug 29, 2021
7dec65c
CI test for github
ong6 Aug 29, 2021
d77fb88
CI test
ong6 Aug 29, 2021
3a7c42f
Test actualy CI output
ong6 Aug 29, 2021
99fb3ff
Fixed test for diffChars
ong6 Aug 29, 2021
aa70337
Update test cases
ong6 Aug 29, 2021
3d9aed2
Remove pictures
ong6 Sep 14, 2021
12d5060
add png to gitignore
ong6 Sep 14, 2021
b707e7c
revert the png changes
ong6 Sep 15, 2021
72f9ef4
Removed gitnore changes
ong6 Sep 18, 2021
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ packages/core/template/*/_site

# Generated site (MarkBind)
packages/cli/test/functional/*/_site
packages/cli/test/functional/test_site/expected/diagrams/*.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will still need to track the changes of the generated diagrams when there are updates to the test .puml files here (add/remove .puml files or simply updating the code in the .puml files etc).

What I meant earlier about "ignoring" the generated images is when there are no changes made to the original .puml test files before running updatetest. In this scenario, we should revert the changes made to the expected images generated after updatetest as the images should not have changed. Sorry for the confusion 😅

Just need to remove this line here and the rest is good 👍


# vscode configuration
.vscode/
Expand Down
72 changes: 63 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions packages/cli/test/functional/testUtil/compare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const diffChars = require('./diffChars');
const _ = {};
_.isEqual = require('lodash/isEqual');

// Other files to ignore / files with binary extensions not recognised by istextorbinary package
// Other files to ignore / files with binary extensions not recognized by istextorbinary package
const TEST_BLACKLIST = ignore().add([
'*.log',
'*.woff',
Expand All @@ -24,6 +24,7 @@ function _readFileSync(...paths) {
return fs.readFileSync(path.resolve(...paths), 'utf8');
}

// Used to compare files expected to be generated by the build process against the expected files
function compare(root, expectedSiteRelativePath = 'expected', siteRelativePath = '_site') {
const expectedDirectory = path.join(root, expectedSiteRelativePath);
const actualDirectory = path.join(root, siteRelativePath);
Expand Down Expand Up @@ -65,7 +66,9 @@ function compare(root, expectedSiteRelativePath = 'expected', siteRelativePath =
}
/* eslint-enable no-continue */

if (error) throw new Error('Diffs found in files');
if (error) {
throw new Error('Diffs found in files');
}
}

module.exports = {
Expand Down
1 change: 1 addition & 0 deletions packages/cli/test/functional/test_site/expected/markbind/css/octicons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
overflow: visible;
}
1 change: 1 addition & 0 deletions packages/cli/test/functional/test_site_algolia_plugin/expected/markbind/css/octicons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
overflow: visible;
}
1 change: 1 addition & 0 deletions packages/cli/test/functional/test_site_convert/expected/markbind/css/octicons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
overflow: visible;
}
1 change: 1 addition & 0 deletions packages/cli/test/functional/test_site_special_tags/expected/markbind/css/octicons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
overflow: visible;
}
1 change: 1 addition & 0 deletions ...s/cli/test/functional/test_site_templates/test_default/expected/markbind/css/octicons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
overflow: visible;
}
1 change: 1 addition & 0 deletions ...s/cli/test/functional/test_site_templates/test_minimal/expected/markbind/css/octicons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
display: inline-block;
vertical-align: text-top;
fill: currentColor;
overflow: visible;
}
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dependencies": {
"@fortawesome/fontawesome-free": "^5.14.0",
"@markbind/core-web": "^3.0.6",
"@primer/octicons": "^9.3.1",
"@primer/octicons": "^15.0.1",
"@sindresorhus/slugify": "^0.9.1",
"bluebird": "^3.7.2",
"bootswatch": "^4.4.1",
Expand Down Expand Up @@ -72,4 +72,4 @@
"jest": "^26.1.0",
"memfs": "^3.0.1"
}
}
}