mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-19 08:14:50 +00:00
Code Issues Releases Wiki Activity

Change tiddler separator used in wikitext tests

Browse Source 
Underscore looked ambiguous; I kept typing dashes by accident
This commit is contained in:
jeremy@jermolene.com 2022-05-03 16:53:00 +01:00
parent 56c2242e4e
commit 719a5614cb
21 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editions/test/tiddlers/tests/data/genesis-widget/DollarSigns.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$genesis $type="let" myvar="Kitten">(<$text text=<<myvar>>/>)</$genesis> <$genesis $type="let" myvar="Kitten">(<$text text=<<myvar>>/>)</$genesis>
<$genesis $type="let" $$myvar="Kitten">(<$text text=<<$myvar>>/>)</$genesis> <$genesis $type="let" $$myvar="Kitten">(<$text text=<<$myvar>>/>)</$genesis>
_ +
title: ExpectedResult title: ExpectedResult
<p>(Kitten)(Kitten)</p> <p>(Kitten)(Kitten)</p>

2
editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$genesis $type="let" $names="myvar other" $values="Kitten Donkey" myvar="Shark">(<$text text=<<myvar>>/>|<$text text=<<other>>/>)</$genesis> <$genesis $type="let" $names="myvar other" $values="Kitten Donkey" myvar="Shark">(<$text text=<<myvar>>/>|<$text text=<<other>>/>)</$genesis>
<$genesis $type="let" $names="$myvar $other" $values="Kitten Donkey" $$myvar="Shark">(<$text text=<<$myvar>>/>|<$text text=<<$other>>/>)</$genesis> <$genesis $type="let" $names="$myvar $other" $values="Kitten Donkey" $$myvar="Shark">(<$text text=<<$myvar>>/>|<$text text=<<$other>>/>)</$genesis>
_ +
title: ExpectedResult title: ExpectedResult
<p>(Shark|Donkey)(Shark|Donkey)</p> <p>(Shark|Donkey)(Shark|Donkey)</p>

4
editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid
View File

@ -21,11 +21,11 @@ title: Output
(<$text text=<<$two>>/>) (<$text text=<<$two>>/>)
(<$text text=<<$$three>>/>) (<$text text=<<$$three>>/>)
</$let> </$let>
_ +
title: Definition title: Definition
\whitespace trim \whitespace trim
_ +
title: ExpectedResult title: ExpectedResult
<p>(--Elephant--) <p>(--Elephant--)

2
editions/test/tiddlers/tests/data/genesis-widget/Simple.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$genesis $tag="div">Mouse</$genesis> <$genesis $tag="div">Mouse</$genesis>
<$genesis $tag="div" class="tc-thing" label="Squeak">Mouse</$genesis> <$genesis $tag="div" class="tc-thing" label="Squeak">Mouse</$genesis>
_ +
title: ExpectedResult title: ExpectedResult
<p><div>Mouse</div><div class="tc-thing" label="Squeak">Mouse</div></p> <p><div>Mouse</div><div class="tc-thing" label="Squeak">Mouse</div></p>

4
editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='Result'> <$transclude $tiddler='Result'>
</$transclude> </$transclude>
_ +
title: Actions title: Actions
\whitespace trim \whitespace trim
@ -21,7 +21,7 @@ title: Actions
<$action-mywidget one="Dingo"> <$action-mywidget one="Dingo">
Crocodile Crocodile
</$action-mywidget> </$action-mywidget>
_ +
title: ExpectedResult title: ExpectedResult
<p>Dingo</p> <p>Dingo</p>

6
editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid
View File

@ -12,18 +12,18 @@ title: Output
<$let test="Tiger"> <$let test="Tiger">
<$codeblock code=<<test>>/> <$codeblock code=<<test>>/>
</$let> </$let>
_ +
title: Definition title: Definition
\whitespace trim \whitespace trim
\function <$codeblock>(code) \function <$codeblock>(code)
<$codeblock code={{{ [<code>addprefix[£]addsuffix[@]] }}}/> <$codeblock code={{{ [<code>addprefix[£]addsuffix[@]] }}}/>
\end \end
_ +
title: Subject title: Subject
Python Python
_ +
title: ExpectedResult title: ExpectedResult
<p><pre><code>£Kangaroo@</code></pre><pre><code>£Python@</code></pre><pre><code>£Tiger@</code></pre></p> <p><pre><code>£Kangaroo@</code></pre><pre><code>£Python@</code></pre><pre><code>£Tiger@</code></pre></p>

6
editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid
View File

@ -8,11 +8,11 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne' one='Ferret'> <$transclude $tiddler='TiddlerOne' one='Ferret'>
</$transclude> </$transclude>
_ +
title: TiddlerZero title: TiddlerZero
Antelope Antelope
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -27,7 +27,7 @@ title: TiddlerOne
<$transclude $tiddler="TiddlerZero"> <$transclude $tiddler="TiddlerZero">
Crocodile Crocodile
</$transclude> </$transclude>
_ +
title: ExpectedResult title: ExpectedResult
<p>Antelope</p> <p>Antelope</p>

4
editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne' one='Ferret'> <$transclude $tiddler='TiddlerOne' one='Ferret'>
</$transclude> </$transclude>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -23,7 +23,7 @@ title: TiddlerOne
<$mywidget one="Dingo"> <$mywidget one="Dingo">
Crocodile Crocodile
</$mywidget> </$mywidget>
_ +
title: ExpectedResult title: ExpectedResult
<p>DingoCrocodile</p> <p>DingoCrocodile</p>

4
editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne'> <$transclude $tiddler='TiddlerOne'>
</$transclude> </$transclude>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -23,7 +23,7 @@ title: TiddlerOne
<$text text="Dingo"> <$text text="Dingo">
Crocodile Crocodile
</$text> </$text>
_ +
title: ExpectedResult title: ExpectedResult
<p>DingoCrocodile</p> <p>DingoCrocodile</p>

4
editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne' one='Ferret'> <$transclude $tiddler='TiddlerOne' one='Ferret'>
</$transclude> </$transclude>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -23,7 +23,7 @@ title: TiddlerOne
<$mywidget $variable="Dingo"> <$mywidget $variable="Dingo">
Crocodile Crocodile
</$mywidget> </$mywidget>
_ +
title: ExpectedResult title: ExpectedResult
<p>DingoCrocodile</p> <p>DingoCrocodile</p>

4
editions/test/tiddlers/tests/data/transclude/MissingTarget.tid
View File

@ -34,7 +34,7 @@ title: Output
</$parameters> </$parameters>
</$value> </$value>
</$transclude> </$transclude>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -42,7 +42,7 @@ title: TiddlerOne
Piranha Piranha
<$text text=<<one>>/> <$text text=<<one>>/>
</$parameters> </$parameters>
_ +
title: ExpectedResult title: ExpectedResult
<p>PiranhaFerretPiranhaFerretBadgerFerretBadgerFerret</p> <p>PiranhaFerretPiranhaFerretBadgerFerretBadgerFerret</p>

6
editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid
View File

@ -11,7 +11,7 @@ title: Output
{{TiddlerOne|Butterfly|Moth}} {{TiddlerOne|Butterfly|Moth}}
{{TiddlerOne|Beetle|Scorpion|Snake}} {{TiddlerOne|Beetle|Scorpion|Snake}}
{{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}} {{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}}
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -19,13 +19,13 @@ title: TiddlerOne
<$list filter="[enlist<paramNames>]" counter="counter"> <$list filter="[enlist<paramNames>]" counter="counter">
{<$text text={{{ [enlist<paramNames>nth<counter>] }}}/>:<$text text={{{ [enlist<paramValues>nth<counter>] }}}/>} {<$text text={{{ [enlist<paramNames>nth<counter>] }}}/>:<$text text={{{ [enlist<paramValues>nth<counter>] }}}/>}
</$list> </$list>
_ +
title: TiddlerTwo title: TiddlerTwo
\whitespace trim \whitespace trim
\parameters(zero:'Mouse',one:'Horse',two:'Owl') \parameters(zero:'Mouse',one:'Horse',two:'Owl')
(<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>) (<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>)
_ +
title: ExpectedResult title: ExpectedResult
<p></p><p>{0:Ferret}</p><p>{0:Butterfly}{1:Moth}</p><p>{0:Beetle}{1:Scorpion}{2:Snake}</p><p>({zero:Beetle}{one:Scorpion}{two:Snake})</p> <p></p><p>{0:Ferret}</p><p>{0:Butterfly}{1:Moth}</p><p>{0:Beetle}{1:Scorpion}{2:Snake}</p><p>({zero:Beetle}{one:Scorpion}{two:Snake})</p>

6
editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid
View File

@ -11,19 +11,19 @@ title: Output
{{TiddlerOne|Butterfly|Moth}} {{TiddlerOne|Butterfly|Moth}}
{{TiddlerOne|Beetle|Scorpion|Snake}} {{TiddlerOne|Beetle|Scorpion|Snake}}
{{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}} {{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}}
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
\parameters(zero:Jaguar,one:'Lizard',two:'Mole') \parameters(zero:Jaguar,one:'Lizard',two:'Mole')
[{<$text text=<<zero>>/>}{<$text text=<<one>>/>}{<$text text=<<two>>/>}] [{<$text text=<<zero>>/>}{<$text text=<<one>>/>}{<$text text=<<two>>/>}]
_ +
title: TiddlerTwo title: TiddlerTwo
\whitespace trim \whitespace trim
\parameters(zero:'Mouse',one:Horse,two:'Owl') \parameters(zero:'Mouse',one:Horse,two:'Owl')
(<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>) (<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>)
_ +
title: ExpectedResult title: ExpectedResult
<p>[{Jaguar}{Lizard}{Mole}]</p><p>[{Ferret}{Lizard}{Mole}]</p><p>[{Butterfly}{Moth}{Mole}]</p><p>[{Beetle}{Scorpion}{Snake}]</p><p>([{Beetle}{Scorpion}{Snake}])</p> <p>[{Jaguar}{Lizard}{Mole}]</p><p>[{Ferret}{Lizard}{Mole}]</p><p>[{Butterfly}{Moth}{Mole}]</p><p>[{Beetle}{Scorpion}{Snake}]</p><p>([{Beetle}{Scorpion}{Snake}])</p>

6
editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid
View File

@ -11,19 +11,19 @@ title: Output
{{TiddlerOne|Butterfly|Moth}} {{TiddlerOne|Butterfly|Moth}}
{{TiddlerOne|Beetle|Scorpion|Snake}} {{TiddlerOne|Beetle|Scorpion|Snake}}
{{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}} {{TiddlerOne||TiddlerTwo|Beetle|Scorpion|Snake}}
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
<$parameters zero='Jaguar' one='Lizard' two='Mole'>[{<$text text=<<zero>>/>}{<$text text=<<one>>/>}{<$text text=<<two>>/>}]</$parameters> <$parameters zero='Jaguar' one='Lizard' two='Mole'>[{<$text text=<<zero>>/>}{<$text text=<<one>>/>}{<$text text=<<two>>/>}]</$parameters>
_ +
title: TiddlerTwo title: TiddlerTwo
\whitespace trim \whitespace trim
<$parameters zero='Mouse' one='Horse' two='Owl'> <$parameters zero='Mouse' one='Horse' two='Owl'>
(<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>) (<$transclude $tiddler=<<currentTiddler>> zero=<<zero>> one=<<one>> two=<<two>>/>)
</$parameters> </$parameters>
_ +
title: ExpectedResult title: ExpectedResult
<p>[{Jaguar}{Lizard}{Mole}]</p><p>[{Ferret}{Lizard}{Mole}]</p><p>[{Butterfly}{Moth}{Mole}]</p><p>[{Beetle}{Scorpion}{Snake}]</p><p>([{Beetle}{Scorpion}{Snake}])</p> <p>[{Jaguar}{Lizard}{Mole}]</p><p>[{Ferret}{Lizard}{Mole}]</p><p>[{Butterfly}{Moth}{Mole}]</p><p>[{Beetle}{Scorpion}{Snake}]</p><p>([{Beetle}{Scorpion}{Snake}])</p>

4
editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid
View File

@ -13,14 +13,14 @@ title: Output
<$transclude $tiddler='TiddlerOne' zero='Ferret' 0='Pigeon'/> <$transclude $tiddler='TiddlerOne' zero='Ferret' 0='Pigeon'/>
<$transclude zero='Ferret' 0='Pigeon' $tiddler='TiddlerOne'/> <$transclude zero='Ferret' 0='Pigeon' $tiddler='TiddlerOne'/>
<$transclude $tiddler='TiddlerOne'/> <$transclude $tiddler='TiddlerOne'/>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
<$parameters zero='Jaguar'> <$parameters zero='Jaguar'>
<$text text=<<zero>>/> <$text text=<<zero>>/>
</$parameters> </$parameters>
_ +
title: ExpectedResult title: ExpectedResult
<p>FerretFerretPigeonPigeonFerretFerretJaguar</p> <p>FerretFerretPigeonPigeonFerretFerretJaguar</p>

4
editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid
View File

@ -8,13 +8,13 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne' one='Ferret'/> <$transclude $tiddler='TiddlerOne' one='Ferret'/>
<$transclude $tiddler='TiddlerOne'/> <$transclude $tiddler='TiddlerOne'/>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
\parameters(one:'Jaguar') \parameters(one:'Jaguar')
<$text text=<<one>>/> <$text text=<<one>>/>
_ +
title: ExpectedResult title: ExpectedResult
<p>FerretJaguar</p> <p>FerretJaguar</p>

2
editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid
View File

@ -12,7 +12,7 @@ title: Output
<$transclude $variable='test' one='Ferret'/> <$transclude $variable='test' one='Ferret'/>
<$transclude $variable='test'/> <$transclude $variable='test'/>
_ +
title: ExpectedResult title: ExpectedResult
<p>{Ferret}{Jaguar}</p> <p>{Ferret}{Jaguar}</p>

4
editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid
View File

@ -8,14 +8,14 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne' one='Ferret'/> <$transclude $tiddler='TiddlerOne' one='Ferret'/>
<$transclude $tiddler='TiddlerOne'/> <$transclude $tiddler='TiddlerOne'/>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
<$parameters one='Jaguar'> <$parameters one='Jaguar'>
<$text text=<<one>>/> <$text text=<<one>>/>
</$parameters> </$parameters>
_ +
title: ExpectedResult title: ExpectedResult
<p>FerretJaguar</p> <p>FerretJaguar</p>

4
editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid
View File

@ -8,7 +8,7 @@ title: Output
\whitespace trim \whitespace trim
<$transclude $tiddler='TiddlerOne' one='Ferret'> <$transclude $tiddler='TiddlerOne' one='Ferret'>
</$transclude> </$transclude>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -18,7 +18,7 @@ title: TiddlerOne
Whale Whale
</$slot> </$slot>
</$parameters> </$parameters>
_ +
title: ExpectedResult title: ExpectedResult
<p>FerretWhale</p> <p>FerretWhale</p>

4
editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid
View File

@ -11,7 +11,7 @@ title: Output
Hippopotamus Hippopotamus
</$value> </$value>
</$transclude> </$transclude>
_ +
title: TiddlerOne title: TiddlerOne
\whitespace trim \whitespace trim
@ -21,7 +21,7 @@ title: TiddlerOne
Whale Whale
</$slot> </$slot>
</$parameters> </$parameters>
_ +
title: ExpectedResult title: ExpectedResult
<p>FerretHippopotamus</p> <p>FerretHippopotamus</p>

2
plugins/tiddlywiki/jasmine/run-wiki-based-tests.js
View File

@ -49,7 +49,7 @@ describe("Wiki-based tests", function() {
}); });
function readMultipleTiddlersTiddler(title) { function readMultipleTiddlersTiddler(title) {
var rawTiddlers = $tw.wiki.getTiddlerText(title).split("\n_\n"); var rawTiddlers = $tw.wiki.getTiddlerText(title).split("\n+\n");
var tiddlers = []; var tiddlers = [];
$tw.utils.each(rawTiddlers,function(rawTiddler) { $tw.utils.each(rawTiddlers,function(rawTiddler) {
var fields = Object.create(null), var fields = Object.create(null),