Commit Graph

588 Commits

Author SHA1 Message Date
Matheus Braga 42ac630304
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-17 21:41:27 -03:00
Matheus B 7e77433ef7 Add tests for subgraph title margin 2023-11-17 20:49:54 -03:00
RounakJoshi09 c19fa122af
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-11-17 11:28:20 +05:30
Sidharth Vinod b6983e4b21
Add title to tests 2023-11-15 00:59:34 +05:30
Sidharth Vinod 7c79bbd6b0
refactor: Address review comments
Moved some types around
Removed unnecessary params

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-14 11:48:11 +05:30
Sidharth Vinod ce6bfcb7f5
Merge branch 'next' into feat/948_packetDiagram
* next: (193 commits)
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  Update docs
  Documentation: clarify sentence
  Fix lint
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  Update demos/sequence.html
  chore: release v10.6.1
  fix
  fix
  fix: render the participants in same order as they are created
  fix(flow): fix invalid ellipseText regex
  ...
2023-11-14 11:21:15 +05:30
Nikolay Rozhkov fb031ee11a
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring 2023-11-13 23:14:42 +03:00
Guy Pursey d80e1a2662 GitGraph: added commit IDs to e2e test to remove false positives
Should stop randomised commit IDs from showing arbitrary
differences between test runs.
2023-10-31 17:24:13 +00:00
Guy Pursey f7d83e2cda GitGraph: added 2x e2e tests for branches not used immediately
My focus earlier on had been on relationship to `main` branch
so this is to ensure that we have some tests that cover
relationship between a pair of branches that doesn't
include `main`.
2023-10-31 17:24:13 +00:00
Guy Pursey adfe1728ae GitGraph: Added e2e tests for deferred branch use.
In these tests, a new branch is created but then a commit is made
on the main branch before the new branch gets a commit. This
important to see what happens with rerouting of arrows.

Suggested by @nirname in PR review of #4927.
2023-10-31 17:24:13 +00:00
Guy Pursey 2acad550da GitGraph: e2e tests, added commit IDs to test graphs
Followed practice of other tests so that commit IDs are
stabilised (i.e., not randomly generated) and therefore
don't show repeatedly in Cypress diff output screenshots
2023-10-31 17:24:13 +00:00
Guy Pursey b0b276898a GitGraph: fixed an e2e branch for vertical branch
Fix for error spotted by @mathbraga
2023-10-31 17:24:13 +00:00
Guy Pursey 25a678caec GitGraph: added e2e tests for multiple branches from one commit 2023-10-31 17:24:13 +00:00
Faris 61fb9e50d3
Merge branch 'develop' into fix/1294_exhaustive-clear-sequenceDb-variables 2023-10-30 13:39:09 +03:00
Harshit Anand 54ab3fc3b2 fix: added an e2e test case for classdiagram with anchor tag 2023-10-26 14:55:04 +05:30
Vincent Lam 6d2904cff1 Added linting 2023-10-25 17:38:34 -07:00
itsalam c08f927d60 Fixed styling for lines for ELK flowchart 2023-10-25 17:38:34 -07:00
RounakJoshi09 58e9e5658b e2e test case added 2023-10-22 21:12:04 +05:30
Faris Nabiev fc0ade2985 chore(sequence): update doc for actors/participant creation/deletion fix 2023-10-13 12:07:36 +03:00
Faris Nabiev 985eda2dee chore: add e2e test that shows db cleanup problem 2023-10-13 00:43:48 +03:00
Faris Nabiev 18ea27ac58 chore: add e2e test that shows db cleanup problem 2023-10-13 00:02:46 +03:00
NicolasNewman 6fa8a51a21 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-10-11 10:46:45 -05:00
Marcel Ribeiro-Dantas 30b3e6213f
fix(typos): Fix minor typos in the source code
Signed-off-by: Marcel Ribeiro-Dantas <mribeirodantas@seqera.io>
2023-10-07 22:16:11 -03:00
Nikolay Rozhkov 936319b9ad
Merge branch 'develop' into feature/4269_add_xychart 2023-10-06 12:13:21 +03:00
Nikolay Rozhkov c63ea3e987
Commented out broken test (#4913)
* Commented out bronken test

* Skip test instead of commenting out

* Fix

* Update cypress/integration/rendering/gantt.spec.js

Co-authored-by: Alois Klink <alois@aloisklink.com>

---------

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-10-06 04:45:13 +00:00
Subhash Halder 0d64d8d8e7 Merge branch 'develop' into feature/4269_add_xychart 2023-10-02 20:52:47 +05:30
Knut Sveidqvist 279c1ee6ba Merge branch 'master' into develop 2023-10-02 10:22:21 +02:00
Subhash Halder 8b04c2ce88 Merge branch 'develop' into feature/4269_add_xychart 2023-09-29 18:12:21 +05:30
Sidharth Vinod 63f4a56ec5
chore: Add test for gantt rendering 2023-09-26 19:21:14 +05:30
Sidharth Vinod 0534d758ce
Merge pull request #4860 from dreathed/bug/4849_center_axis_labels
bug/4849_center_axis_labels
2023-09-22 05:59:18 +00:00
Sidharth Vinod 2f6c1972e1
Update cypress/integration/rendering/quadrantChart.spec.js 2023-09-22 05:37:49 +00:00
Hans Blankenhaus de770e4c3c changed name of test 2023-09-21 15:42:36 +02:00
Hans Blankenhaus 05e94b430a add image snapshot test for quadrantchart 2023-09-21 15:25:51 +02:00
Subhash Halder e56effa029 Merge branch 'develop' into feature/4269_add_xychart 2023-09-19 21:16:52 +05:30
Subhash Halder e061489b84 Added review changes 2023-09-19 21:09:31 +05:30
Alois Klink 17f5052a6f test(e2e): wait for theme-directives.html
The `theme-directives.html` test currently sometimes takes a screenshot
before all of the Mermaid diagrams have completed rendering.

We can use the `urlSnapshopTest()` helper function, which waits until
a `.rendered` property exists on the page.

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-09-17 18:56:20 +01:00
Sidharth Vinod 75f1f9228d
test: Add rendering tests 2023-09-14 23:12:06 +05:30
Subhash Halder adb3cd16df Merge branch 'develop' into feature/4269_add_xychart 2023-09-14 20:50:27 +05:30
Chad Fawcett 924c9e913b Added cypress test 2023-09-11 11:59:28 -07:00
Subhash Halder b98217e3c3 Fix YAML themeVariables config 2023-09-07 13:31:52 +05:30
Subhash Halder fae648c253 Added the file name changes 2023-09-07 13:16:46 +05:30
Subhash Halder 9558cb9b16 Merge branch 'develop' into feature/4269_add_xychart 2023-09-07 12:55:22 +05:30
Subhash Halder 7c7d5881b7 Fixed all review comment 2023-09-07 12:45:22 +05:30
Sidharth Vinod c212490248
Merge pull request #4778 from vertxxyz/feature/4771_tickInterval-support-for-sec-and-ms
Added support for millisecond and second to gantt tickInterval
2023-09-06 13:03:05 +00:00
Subhash Halder a344eb48f4 Added cypress test cases 2023-09-03 20:48:52 +05:30
Thomas Ingram 4efac6721d Added missing integration tests and release version in docs. 2023-08-28 20:17:15 +10:00
Justin Greywolf b513169f12 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-26 14:01:42 -07:00
Justin Greywolf 8e64995047 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-25 10:58:49 -07:00
Sidharth Vinod a4ba192aad
Merge branch 'develop' into feat/4746_add_er_alias 2023-08-25 03:06:47 +00:00
Tom PERRILLAT-COLLOMB 4a06bc1a68 test(er): add cypress test on entity name alias 2023-08-22 13:53:37 +02:00
Sidharth Vinod 844a175039
chore: Add test with both frontmatter and directive 2023-08-21 12:30:04 +05:30
Sidharth Vinod a6e6c3fb18
feat: Add support for config in frontmatter 2023-08-21 12:09:38 +05:30
Justin Greywolf 9a9abac5b1 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-15 10:08:42 -07:00
Reda Al Sulais 0d179c501e
Merge branch 'develop' into standardized-pie-definitions 2023-08-15 14:01:09 +03:00
Knut Sveidqvist c5e7e6040c Adding new flowchart tests related to issue #2139 2023-08-11 13:58:19 +02:00
Reda Al Sulais 71205f5bd6
Merge branch 'mermaid-js:develop' into standardized-pie-definitions 2023-08-05 21:33:03 +03:00
Reda Al Sulais 7d69ad2d5b Merge remote-tracking branch upstream/develop into standardized-pie-definitions 2023-08-02 15:54:23 +03:00
Ibrahim Wassouf 834c67ecaa Remove escaped quotes with backslash feature 2023-07-31 22:47:05 -03:00
Ibrahim Wassouf 844f9d96e7 Update and add new imgSnapshotTest 2023-07-29 22:16:28 -03:00
Ibrahim Wassouf 9eed2e278b Add imgSnapshotTest for escaped quotes 2023-07-27 09:29:26 -03:00
Ibrahim Wassouf 1df68f9a5f Remove class statement to show application of default class 2023-07-27 09:29:26 -03:00
Ibrahim Wassouf 1dfb400a46
Merge branch 'develop' into bug/4645_graph_node_containing_keyword 2023-07-26 16:59:54 -04:00
Ibrahim Wassouf 30a9b5574d Correct classDef and class grammar
Previously, you were allowed to define a class called 'default'
but were not allowed to use it because the classStatement grammar
expected an alphanum, which did not include the word DEFAULT
2023-07-25 20:35:08 -03:00
Knut Sveidqvist 15c6dfcbb5 Updates after tests 2023-07-25 16:43:09 +02:00
Sibin Thomas 99e88e4d0d
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 16:03:19 +05:30
Sibin Thomas a171903088 added tests for overlapping commits 2023-07-20 13:15:05 +05:30
Yokozuna59 66e5f8ae18
Merge branch 'develop' into convert-cypress-util-to-ts 2023-07-19 19:09:58 +03:00
Sibin Thomas 52a4f8f077 added tests for vertical branches 2023-07-19 20:22:59 +05:30
Sidharth Vinod e66135b67e
Merge pull request #4496 from moka-care/bug/4439_graph_doesnt_load_when_img_fail_to_load
Fix graph not loading when the img loads too fast or fail to load
2023-07-18 07:57:38 +00:00
Yokozuna59 072638ce9d
Merge pull request #4634 from leinelissen/develop
feat: allow specifying on which weekday a tickInterval should start
2023-07-18 07:33:08 +00:00
Yokozuna59 bed8710dbb
Merge branch 'mermaid-js:develop' into convert-cypress-util-to-ts 2023-07-17 15:31:11 +03:00
Sidharth Vinod d3006f6298
chore: Remove numbers from tests 2023-07-17 15:16:05 +05:30
Sidharth Vinod 24f04bb24d
Merge branch 'develop' into bug/4592_fix_newLine_padding_class_diagram 2023-07-17 15:11:39 +05:30
Sidharth Vinod b5bcc3b992
Revert "Refactor integration tests"
This reverts commit 80add648e6.
2023-07-17 15:11:14 +05:30
Lei Nelissen 0d7427ed20 chore: add cypress test 2023-07-14 14:13:18 +02:00
Ibrahim Wassouf bb220b8b87 Add test for string label 2023-07-13 16:53:29 -03:00
Ibrahim Wassouf 80add648e6 Refactor integration tests 2023-07-13 16:43:52 -03:00
Ibrahim Wassouf 12c657f514 Add imgSnapshotTests 2023-07-12 16:46:29 -03:00
Pierrick Wauquier 9e5ccbe13f
Merge branch 'develop' into bug/4439_graph_doesnt_load_when_img_fail_to_load 2023-07-11 17:10:19 +02:00
NicolasNewman f15e8c9edb Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-07-08 10:45:36 +09:00
Ibrahim Wassouf cd118ad5cb Update erDiagram to make entity names in singular form 2023-07-07 19:59:52 -03:00
Sidharth Vinod 0cdf801884
Fix import file extension 2023-07-07 17:21:18 +05:30
Yokozuna59 f0bf6bf574
Merge branch 'develop' into convert-cypress-util-to-ts 2023-07-07 11:17:22 +02:00
Ibrahim Wassouf 42da53f58a Add imgSnapshotTest 2023-07-06 22:15:18 -03:00
Justin Greywolf 1d391d9408 Merge branch 'develop' into UpdateClassMemberHandling 2023-07-02 17:45:30 -07:00
Sidharth Vinod 19325777e5
Merge branch 'develop' into feature/1838_actor_creation_destruction 2023-07-02 10:32:59 +05:30
Nikolay Rozhkov abb7bb23d6 More detailed sankey docs 2023-07-02 02:34:22 +03:00
Nikolay Rozhkov 8ed2ee30ec Sankey alignment tests 2023-07-02 02:15:23 +03:00
Nikolay Rozhkov 084b765e9f Added tests for colors and fully setup cypress in Docker 2023-07-02 01:10:06 +03:00
Nikolay Rozhkov a62719826a Docker+Cypress, better run, removed unused syntax
Added cypress container (from their official image),
may be reconsidered later to choose our own
The only minor problem is node JS version mistmatch
package.json 18.16.0
docker-compose mermaid 18.16.1
docker-compose cypress 18.16.0

Host option in cypress docker container must be removed
in favor of possible configuration option.
http://localhost:9000 are currently hard-coded, that is bad

Updated ./run script with better documentation
and added some styles too it as well

Started sankey.spec.js as an example
2023-07-01 16:17:25 +03:00
Sidharth Vinod 3fe0c8b13d
Merge branch 'develop' into feature/1838_actor_creation_destruction 2023-06-30 16:00:24 +05:30
Justin Greywolf 3718274a1c Merge branch 'develop' into UpdateClassMemberHandling 2023-06-28 08:26:33 -07:00
Yokozuna59 48fc60f866 fix wrong config paramater in some cypress spec
- flowchart
- mindmap
2023-06-27 20:59:43 +03:00
Nikolay Rozhkov a38733346f Removed unnecessary configs and extra code 2023-06-25 21:56:14 +03:00
Nikolay Rozhkov db2a556f62 Cleanup 2023-06-25 00:23:42 +03:00
Nikolay Rozhkov 1674f12b62 Renamed sankey to sankey-beta 2023-06-24 23:11:54 +03:00
NicolasNewman 8b42302f9b Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-06-23 16:57:30 +09:00
Nikolay Rozhkov be9cd480aa Sankey syntax has beed reduced 2023-06-22 15:58:09 +03:00
Nikolay Rozhkov 272615e580 Fixed tests and added node alignment 2023-06-21 03:54:55 +03:00
Nikolay Rozhkov 8e001b92f2 Cleared sankey renderer 2023-06-19 01:02:50 +03:00
Yokozuna59 5aba2fed8b remove cy.get of info diagram 2023-06-17 00:01:54 +03:00
Yokozuna59 c17b723295 convert pie.spec.js to ts, remove cy.get and useless comment, add showData unit test case 2023-06-16 23:45:13 +03:00
Yokozuna59 ea3fbbd58d initial converting pie files 2023-06-16 23:05:06 +03:00
Sidharth Vinod 5c63c5ceae
Rebuild 2023-06-16 23:12:03 +05:30
Pierrick Wauquier 270586095f fix typo in test description 2023-06-16 16:37:34 +02:00
Pierrick Wauquier 8b6485035e add failing test 2023-06-16 16:32:11 +02:00
Yokozuna59 b7795ef12d
remove empty options in cypress info.spec.ts 2023-06-15 03:18:09 +03:00
Yokozuna59 7e639bec3a convert the cypress info.spec.js into ts 2023-06-15 02:41:07 +03:00
Justin Greywolf f4ffd5c965 Merge branch 'develop' into UpdateClassMemberHandling 2023-06-09 16:01:15 -07:00
Laura Valentine Tscharner d06bb05c5f feat(sequence): actor creation and destruction #1838 2023-06-08 17:17:31 +01:00
Sidharth Vinod 88b94dea66
Merge branch 'develop' into pr/MikeJeffers/4416
* develop: (45 commits)
  Add nextra to cSpell
  Update docs: Added Nextra to Blogs category on integrations page
  Render empty lines correctly
  Restore classes on edges for elk
  Update diagram proposal
  Update docs
  Added CKEditor and GitHub Writer to available integrations.
  Fix exceptions for empty lines
  chore(deps): update all patch dependencies
  build(deps): fix broken pnpm-lock.yaml file
  Mermaid version 10.2.0
  Mermaid Version 10.2.0-rc.4
  Label background fix
  Test commit
  Fix for regression error in sequenceDiagrams
  Update all minor dependencies
  Update all patch dependencies
  Update docs
  Add contributors profile url
  ignore ZenUML types
  ...
2023-06-08 00:16:49 +05:30
Sidharth Vinod f20ff4d580
Merge pull request #4436 from slab/zh-mermaid-empty-text
Fix exceptions for empty lines
2023-06-05 11:43:43 +05:30
Zihua Li 2a6603b33a Render empty lines correctly 2023-06-04 16:24:41 +08:00
Yoav Sternberg da1beb36bf Restore classes on edges for elk 2023-06-02 22:10:39 +03:00
NicolasNewman 0605b85d99 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-05-31 17:27:42 +09:00
Justin Greywolf 0aa09bfca5 Create new type for member handling 2023-05-30 10:43:44 -07:00
Zihua Li ce9bdcc53f Fix exceptions for empty lines 2023-05-29 21:00:37 +08:00
mikejeffers 9e6168111f add e2e test 2023-05-20 15:20:28 -04:00
Sidharth Vinod 97be4983f0
Merge branch 'develop' into sidv/zenuml
* develop: (66 commits)
  Update docs
  Update docs
  Improve the wording of security level values
  Added quadrantChart to the side bar
  Added e2e test cases with some fixes
  Added documentation for the quadrantChart
  Restructured the build function and addressed more review comment
  Fixed some parser issue and added test cases for the parser
  Fixed review comment
  Update docs
  Converted files to typescript and added proper types
  Fix blog linting
  Debug fetch-contributors
  Fix lockfile
  Revert "Replace esno & ts-node with tsx"
  [draft] Added support for quadrant chart
  Fix lockfile
  Fix build
  Update pnpm-lock
  Replace esno & ts-node with tsx
  ...
2023-05-16 23:26:35 +05:30
Subhash Halder 0f354ff974 Added e2e test cases with some fixes 2023-05-13 19:45:45 +05:30
NicolasNewman e7a1d8390c Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-05-06 17:32:15 +09:00
Justin Greywolf 06fdb95389 Allow overlapping notes 2023-05-03 22:15:59 -07:00
Sidharth Vinod 8b18fd93f4
Add test 2023-04-26 00:20:00 +05:30
Kazuki Tsunemi 95d8e3a5df Merge branch 'develop' into feature/class-namespace 2023-04-25 16:40:42 +09:00
Justin Greywolf 642bc1a739 update tests for package visibility 2023-04-17 07:24:27 -07:00
Kazuki Tsunemi 204baa4586 Merge branch 'develop' into feature/class-namespace 2023-04-17 11:27:10 +09:00
NicolasNewman e0e038d223 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid to feature/2776_katex_math 2023-04-14 11:02:24 +09:00
Remco Haszing aa5c1a5f78
Merge branch 'develop' into fix-node16-module-resolution 2023-04-13 14:58:17 +02:00
NicolasNewman f3b939e03a Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-04-13 09:36:48 +09:00
Laura Valentine Tscharner 9bb0cef82b fix: wait for image rendering in nodes 2023-04-08 16:28:58 +01:00
Knut Sveidqvist 917a54f3cd
Merge branch 'develop' into 4220-string-synax-and-features 2023-04-03 12:31:56 +02:00
Knut Sveidqvist 471c842a58 Adding rendering tests and unit tests 2023-04-03 12:12:51 +02:00
Remco Haszing da7725f38e
Merge branch 'develop' into fix-node16-module-resolution 2023-04-01 12:05:19 +02:00
Sidharth Vinod 7e610d13dc
Merge pull request #4207 from aloisklink/test/4198-fix-gantt-today-marker-tests
Fix broken Gantt  `todayMarker` tests
2023-03-31 18:23:06 +05:30
Knut Sveidqvist 057c9e4b81
Merge branch 'develop' into feature/1618_repeating_tasks 2023-03-31 08:42:10 +02:00
Sidharth Vinod 7739302ee8
fix uncaughexception in tests 2023-03-30 23:28:41 +05:30
Sidharth Vinod 46ab6f46f2
fix(#4256): Keep error diagram on screen 2023-03-30 23:09:46 +05:30
Jeremy Funk ba1c5dc6c7 Change to using display mode yaml 2023-03-25 01:56:50 +01:00
Jeremy Funk fd9680a050 Fix bug 2023-03-24 00:18:52 +01:00
Jeremy Funk 8c0550b2b7 Code refactoring, add e2e test 2023-03-23 23:45:59 +01:00
Kazuki Tsunemi 434961b44a Implement rendering logic 2023-03-15 13:26:51 +09:00
Remco Haszing b7d31adda4
Support node16 module resolution
The `node16` module resolution requires imports to use the `.js` file
extension in type definitions.

`@rollup/plugin-typescript` is needed to make this work with the Vite
setup used by Mermaid.

The module option for Mermaid internally is set to `nodenext`. This is
needed to support `.json` imports. Note that setting `module` to
`node16` or `nodenext` implies a matching `moduleResolution` value.
2023-03-11 14:54:21 +01:00
Alois Klink 58d4ba0d8f test(e2e): fix gantt `todayMarker` tests
The gantt diagram that were supposed to test whether
`todayMarker off` works wasn't working properly, because
`todayMarker on` wasn't working (i.e. the test never failed).

I've fixed this issue, and added a test that checks whether
`todayMarker on` works.

Fixes: https://github.com/mermaid-js/mermaid/issues/4198
2023-03-09 19:18:22 +00:00
Sidharth Vinod ad52d7d823
Merge pull request #4145 from Billiam/feature/move-pie-labels
Pie: Adding outer border, text position options
2023-03-05 00:33:15 +05:30
Nicolas Newman 12e1af44fc
Merge branch 'mermaid-js:develop' into feature/2776_katex_math 2023-03-03 20:14:17 -06:00
Billiam 8810b378b3 fixup! fixup! Move pie outerStrokeWidth to theme variables, update docs 2023-02-28 13:48:50 -06:00
Billiam 82f5b4ca39 Move pie outerStrokeWidth to theme variables, update docs 2023-02-28 13:27:09 -06:00
Sidharth Vinod e050a5aaa1
Fix test 2023-02-28 15:40:59 +05:30
Billiam 3bed70a0c5 fixup! fixup! feat(pie): adding outer border, text position options 2023-02-25 15:47:38 -06:00
Billiam b079fb4710 fixup! feat(pie): adding outer border, text position options 2023-02-25 15:43:16 -06:00