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.

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

Markdown support (alternative to Gherkin) #1209

Merged
merged 77 commits into from
May 14, 2021
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
59bc13e
Make lexer handle basic Markdown
Oct 4, 2020
06424d2
Add markdown source envelope, document syntax.
Oct 5, 2020
7d69bfc
WIP
Oct 8, 2020
1caf2d4
Merge branch 'master' into markdown
aslakhellesoy Nov 17, 2020
fd9f1c3
Don't assume .feature extenstion
Nov 18, 2020
3e029e9
Use a separate markdown tokenizer
Nov 18, 2020
7be0198
Extract ITokenMatcher interface
Nov 18, 2020
4e17488
Add new Markdown tokenizer
Nov 19, 2020
4cf018f
Merge branch 'master' into markdown
Nov 19, 2020
db0d9a9
Recognise non-keyword lines as Empty
Nov 20, 2020
9853dee
WIP
Nov 25, 2020
0766138
Merge branch 'master' into markdown
aslakhellesoy Nov 30, 2020
cfbc2af
Merge branch 'master' into markdown
aslakhellesoy Dec 10, 2020
017d14c
Merge branch 'master' into markdown
aslakhellesoy Jan 4, 2021
f2cc54e
Reduce size of generated Languages.pm module by 70%
ehuelsmann Dec 28, 2020
89e3f12
Use Carton (Perl's Bundler) to store project-local dependencies
ehuelsmann Dec 28, 2020
a704da7
Update dependency org.mockito:mockito-junit-jupiter to v3.7.0
renovate-bot Jan 5, 2021
d5fb5c2
Increase stale time
aslakhellesoy Jan 7, 2021
13e54cb
Fix eslint warnings
Jan 9, 2021
300b6b6
Add support for Markdown docstrings (fenced code blocks)
Jan 10, 2021
344e79a
Support GFM tables
Jan 10, 2021
02ca19f
Add Markdown to CCK
Jan 10, 2021
f3e3fff
Disable Java tests for now
Jan 10, 2021
007a99a
Markdown improvements
Feb 1, 2021
2247a33
merge master
Feb 9, 2021
c3a7790
Fix compile and linting errors
Feb 9, 2021
bac9dcc
Open storybook port
Feb 10, 2021
0c05f0a
Fix Markdown rendering
Feb 10, 2021
7f9ae1c
Add missing keyword
Feb 12, 2021
d5b3b80
Merge master
Apr 4, 2021
773d95a
Formatting
Apr 5, 2021
8118975
Merge master
May 1, 2021
fa3a31d
Restore gherkin/java from master
May 1, 2021
2f36997
Remove md dialect
May 1, 2021
27710a5
Merge master
May 4, 2021
2ccb20c
Merge branch 'master' into markdown
aslakhellesoy May 4, 2021
df3218c
Fix compilation errors
May 4, 2021
5b90e97
Fix compilation errors
May 4, 2021
7dd0dc6
Fix gherkin/go and gherkin/java
May 4, 2021
cf15252
Fix messages/java enum serialisation
May 4, 2021
2a4fbd0
Rename cck files
May 4, 2021
6daed51
Remove obsolete files
May 4, 2021
f3a3c72
Update file reference
May 4, 2021
3336b43
Run the go demo formatter
May 4, 2021
bc5cbfa
Add support for markdown tags between single backticks
May 4, 2021
c10b680
Update testdata for markdown tags
May 4, 2021
13b2475
Extract getTags
May 4, 2021
95b67a3
Update dependencies
May 4, 2021
a5e3388
Remove md dialect
May 4, 2021
f1c94b5
Remove obsolete file
May 4, 2021
b58eaa6
Merge branch 'master' into markdown
aslakhellesoy May 5, 2021
40194d1
Merge master
May 7, 2021
9ad00c9
Merge branch 'markdown' of github.com:cucumber/cucumber into markdown
May 7, 2021
41dcf23
Merge branch 'master' into markdown
May 7, 2021
2c0bf4c
Roll back changes to @cucumber/react. We'll redo it when #1391 lands
May 7, 2021
a742a17
Merge branch 'master' into markdown
aslakhellesoy May 7, 2021
380d2fe
Merge branch 'master' into markdown
aslakhellesoy May 7, 2021
c2fc9b6
Update documentation
May 7, 2021
82b6ecd
Renames
May 7, 2021
630c9f6
Document why we're not recognising language directives
May 7, 2021
94fd5a7
Capture descriptions. Make Feature header optional.
May 8, 2021
d9513e7
Reformat, merge main
May 8, 2021
2d9078d
Merge remote-tracking branch 'origin/master' into markdown
May 8, 2021
ba60e40
Update MARKDOWN_WITH_GHERKIN.md
aurelien-reeves May 10, 2021
6902df9
Merge remote-tracking branch 'origin/master' into markdown
aurelien-reeves May 10, 2021
963dcbf
Remove dewscription from Markdown
May 11, 2021
60f1dae
Merge branch 'markdown' of github.com:cucumber/cucumber into markdown
May 11, 2021
e090a61
Merge master
May 11, 2021
0b3874b
Update dependencies
May 11, 2021
62fefff
Merge branch 'master' into markdown
aslakhellesoy May 11, 2021
25ceeb3
Merge remote-tracking branch 'origin/master' into markdown
May 12, 2021
224f1ab
Update dependencies
May 12, 2021
5ca0d0b
Merge branch 'master' into markdown
aslakhellesoy May 13, 2021
7e279a4
Update dependencies
May 14, 2021
2beae34
Update package-lock.json
May 14, 2021
9a7f3e2
Merge master
May 14, 2021
f6a9593
Document why the AST has no description
May 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions compatibility-kit/javascript/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include default.mk

FEATURE_FILES = $(sort $(wildcard features/**/*.feature))
NDJSON_FILES = $(patsubst features/%.feature,features/%.ndjson,$(FEATURE_FILES))
FEATURE_FILES = $(sort $(wildcard features/**/*.feature features/**/*.md))
NDJSON_FILES = $(patsubst features/%,features/%.ndjson,$(FEATURE_FILES))

.DELETE_ON_ERROR:

Expand All @@ -10,7 +10,7 @@ NDJSON_FILES = $(patsubst features/%.feature,features/%.ndjson,$(FEATURE_FILES))
ndjson_files: $(NDJSON_FILES)
.PHONY: ndjson_files

features/%.ndjson: features/%.feature features/%.ts
features/%.ndjson: features/% features/%.ts
ifdef GOLDEN
source ../ci_env
../../node_modules/@cucumber/fake-cucumber/bin/fake-cucumber \
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{"meta":{"protocolVersion":"15.0.0","implementation":{"name":"fake-cucumber","version":"11.0.0"},"cpu":{"name":"x64"},"os":{"name":"linux","version":"4.19.121-linuxkit"},"runtime":{"name":"node.js","version":"12.16.2"}}}
{"source":{"data":"Feature: Data Tables\n Data Tables can be places underneath a step and will be passed as the last\n argument to the step definition. They can be used to represent richer data\n structures, and can also be transformed to other types.\n\n Scenario: transposed table\n When the following table is transposed:\n | a | b |\n | 1 | 2 |\n Then it should be:\n | a | 1 |\n | b | 2 |\n","uri":"features/data-tables/data-tables.feature","mediaType":"text/x.cucumber.gherkin+plain"}}
{"gherkinDocument":{"feature":{"tags":[],"location":{"line":1,"column":1},"language":"en","keyword":"Feature","name":"Data Tables","description":" Data Tables can be places underneath a step and will be passed as the last\n argument to the step definition. They can be used to represent richer data\n structures, and can also be transformed to other types.","children":[{"scenario":{"id":"61bab433-6365-4f0e-8cab-707e5ae55f4b","tags":[],"location":{"line":6,"column":3},"keyword":"Scenario","name":"transposed table","description":"","steps":[{"id":"175ca077-f8f1-4def-ae89-b472462b1fcb","location":{"line":7,"column":5},"keyword":"When ","text":"the following table is transposed:","dataTable":{"location":{"line":8,"column":7},"rows":[{"id":"285afaa8-8d17-4416-a1cb-b48fc63474af","location":{"line":8,"column":7},"cells":[{"location":{"line":8,"column":9},"value":"a"},{"location":{"line":8,"column":13},"value":"b"}]},{"id":"396285a4-1cfc-43e4-9b76-d9a334f2dd16","location":{"line":9,"column":7},"cells":[{"location":{"line":9,"column":9},"value":"1"},{"location":{"line":9,"column":13},"value":"2"}]}]}},{"id":"f6a590e3-5835-460a-b08d-c7fc0b80db42","location":{"line":10,"column":5},"keyword":"Then ","text":"it should be:","dataTable":{"location":{"line":11,"column":7},"rows":[{"id":"e0bf8d21-87ce-4690-8dce-5f643b095d4c","location":{"line":11,"column":7},"cells":[{"location":{"line":11,"column":9},"value":"a"},{"location":{"line":11,"column":13},"value":"1"}]},{"id":"511a5dea-4678-493b-a95a-0f54ce4db3ec","location":{"line":12,"column":7},"cells":[{"location":{"line":12,"column":9},"value":"b"},{"location":{"line":12,"column":13},"value":"2"}]}]}}],"examples":[]}}]},"comments":[],"uri":"features/data-tables/data-tables.feature"}}
{"pickle":{"id":"18dc8fbd-084d-4e55-b88f-f7e745db918b","uri":"features/data-tables/data-tables.feature","astNodeIds":["61bab433-6365-4f0e-8cab-707e5ae55f4b"],"tags":[],"name":"transposed table","language":"en","steps":[{"id":"067fb55b-abf2-4f48-95b0-8e8de52a88a2","text":"the following table is transposed:","argument":{"dataTable":{"rows":[{"cells":[{"value":"a"},{"value":"b"}]},{"cells":[{"value":"1"},{"value":"2"}]}]}},"astNodeIds":["175ca077-f8f1-4def-ae89-b472462b1fcb"]},{"id":"0fd0b189-6487-4d27-b632-e7afb1892f3f","text":"it should be:","argument":{"dataTable":{"rows":[{"cells":[{"value":"a"},{"value":"1"}]},{"cells":[{"value":"b"},{"value":"2"}]}]}},"astNodeIds":["f6a590e3-5835-460a-b08d-c7fc0b80db42"]}]}}
{"stepDefinition":{"id":"35ccd618-ab48-4a1a-ad09-ef9490da6913","pattern":{"type":"CUCUMBER_EXPRESSION","source":"the following table is transposed:"},"sourceReference":{"uri":"features/data-tables/data-tables.feature.ts","location":{"line":5}}}}
{"stepDefinition":{"id":"2aa724a9-aa41-4915-9b65-c9e3b3c89c07","pattern":{"type":"CUCUMBER_EXPRESSION","source":"it should be:"},"sourceReference":{"uri":"features/data-tables/data-tables.feature.ts","location":{"line":9}}}}
{"testRunStarted":{"timestamp":{"seconds":1620122592,"nanos":624000000}}}
{"testCase":{"id":"f6e27f6c-c24e-409b-a1a4-b605cfe473fc","pickleId":"18dc8fbd-084d-4e55-b88f-f7e745db918b","testSteps":[{"id":"db1a0750-9c8a-4684-bd8a-1f0dd59218e3","pickleStepId":"067fb55b-abf2-4f48-95b0-8e8de52a88a2","stepDefinitionIds":["35ccd618-ab48-4a1a-ad09-ef9490da6913"],"stepMatchArgumentsLists":[{"stepMatchArguments":[]}]},{"id":"3ae6230e-d753-4403-af0e-bdae2080c6a9","pickleStepId":"0fd0b189-6487-4d27-b632-e7afb1892f3f","stepDefinitionIds":["2aa724a9-aa41-4915-9b65-c9e3b3c89c07"],"stepMatchArgumentsLists":[{"stepMatchArguments":[]}]}]}}
{"testCaseStarted":{"attempt":0,"testCaseId":"f6e27f6c-c24e-409b-a1a4-b605cfe473fc","id":"777d77e8-1716-48a9-a31b-779b1ae62565","timestamp":{"seconds":1620122592,"nanos":626000000}}}
{"testStepStarted":{"testCaseStartedId":"777d77e8-1716-48a9-a31b-779b1ae62565","testStepId":"db1a0750-9c8a-4684-bd8a-1f0dd59218e3","timestamp":{"seconds":1620122592,"nanos":627000000}}}
{"testStepFinished":{"testCaseStartedId":"777d77e8-1716-48a9-a31b-779b1ae62565","testStepId":"db1a0750-9c8a-4684-bd8a-1f0dd59218e3","testStepResult":{"duration":{"seconds":0,"nanos":920500},"status":"PASSED","willBeRetried":false},"timestamp":{"seconds":1620122592,"nanos":628000000}}}
{"testStepStarted":{"testCaseStartedId":"777d77e8-1716-48a9-a31b-779b1ae62565","testStepId":"3ae6230e-d753-4403-af0e-bdae2080c6a9","timestamp":{"seconds":1620122592,"nanos":629000000}}}
{"testStepFinished":{"testCaseStartedId":"777d77e8-1716-48a9-a31b-779b1ae62565","testStepId":"3ae6230e-d753-4403-af0e-bdae2080c6a9","testStepResult":{"duration":{"seconds":0,"nanos":122299},"status":"PASSED","willBeRetried":false},"timestamp":{"seconds":1620122592,"nanos":630000000}}}
{"testCaseFinished":{"testCaseStartedId":"777d77e8-1716-48a9-a31b-779b1ae62565","timestamp":{"seconds":1620122592,"nanos":630000000}}}
{"testRunFinished":{"timestamp":{"seconds":1620122592,"nanos":631000000},"success":true}}

This file was deleted.

Loading