Skip to content

Commit

Permalink
Use clojureslim-as-jar
Browse files Browse the repository at this point in the history
  • Loading branch information
trptcolin committed Aug 6, 2011
1 parent de079ab commit 0a8814c
Show file tree
Hide file tree
Showing 26 changed files with 80 additions and 661 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -10,3 +10,4 @@ pom.xml
/fitnesse/FitNesseRoot/ErrorLogs
/fitnesse/FitNesseRoot/RecentChanges
/fitnesse/FitNesseRoot/files/testResults
*.zip
Expand Up @@ -22,16 +22,13 @@ A list created as follows {{{ * Item one
#
!|Response Examiner.|
|type|pattern|matches?|value|
|contents|<li>Item One</li>|true||
|contents|<li>Item One<ul>|true||

!|Response Examiner.|
|type|number|string?|
|line|1|<ul>|
|line|2|<li>Item One</li>|
|line|3|<li><ul>|
|line|4|<li>Item Two</li>|
|line|5|</ul>|
|line|6|</li>|
|line|7|</ul>|


|line|2|<li>Item One<ul>|
|line|3|<li>Item Two</li>|
|line|4|</ul>|
|line|5|</li>|
|line|6|</ul>|
Expand Up @@ -18,7 +18,9 @@
|!define PageNAME {''!-PageName-!''} |!define PagePATH {''!-PagePath-!''} |
|!define LabelNAME {''label-name''} |!define AnyPagePATH {''!-AnyPagePath-!''} |
|!define CODE {!-<font style="font-family:Courier New">-!} |!define CODEend (${FONTend}) |
|!define HDR {!-<div style="margin-top:.5em;font-family:Tahoma;font-size:14pt;font-weight:bold;color:#602060">-!}|!define HDRend (${TopOfPAGE}${DIVend}) |

!define HDR {!-<div style="margin-top:.5em;font-family:Tahoma;font-size:14pt;font-weight:bold;color:#602060">-!}
!define HDRend (${TopOfPAGE}${DIVend})
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
!define TOC (|${HDR} Sections ${DIVend}|
|!c '''[[ ${FitNESSE} Command Line ][#FitNesseCommandLINE]] ''' |
Expand Down
Expand Up @@ -33,7 +33,8 @@ You can also declare a scenario by embedding underscores within a string. Each
|ensure|content matches|@htmlText|
|show|content|

The body of the scenario uses the arguments by prefixing them with an '@' sign. The token that follows the '@' ''must be the camel-cased name of the argument.''
The body of the scenario uses the arguments by prefixing them with an '@' sign. The token that follows the '@' ''must be the camel-cased name of the argument.''
Arguments that share a common root string can use optional braces to force the correct evaluation of the full name of the argument. Thus, if you have arguments ''job'' and ''job code'', you can use @{jobCode} to make sure you get the argument with the longer name.

!4 Invoking a scenario from a DecisionTable
!|widget renders|
Expand Down
103 changes: 56 additions & 47 deletions fitnesse/FitNesseRoot/FitNesse/UserGuide/SliM/SlimProtocol/content.txt

Large diffs are not rendered by default.

Expand Up @@ -16,3 +16,6 @@ Navigate to the page where you'd like to add a symbolic link. Click the '''Prop
!3 External SymbolicLinks
For various reasons, you may want to keep a branch of your FitNesse wiki in a different location on your disk, than the rest of the wiki. You may link external branches into the main wiki by using SymbolicLinks. To do so, simply provide the file path to the external FitNesse directory in URL format proceeded with '''file://'''.
* eg. !-file:///User/MicahMartin/fitnesse/ExternalFitNesseRoot-!

SymbolicLinks can also use environment variables to find a branch to add to your wiki.
* eg. !-file://${HOME}/MicahMartin/fitnesse/ExternalFitNesseRoot-!
Expand Up @@ -5,12 +5,13 @@ The project will be run in very short iterations.
!|Change the paths below to the appropriate locations.|

!define TEST_SYSTEM {slim}
!define TEST_RUNNER {clojure.main clojureslim/script/clojureslim.clj}
!define COMMAND_PATTERN {java -cp %p %m}
!define COMMAND_PATTERN {lein run -m clojureslim}

{{{!define COMMAND_PATTERN {java -cp %p %m}
!|Classpath Separator: will need to be ; for Windows|
!define PATH_SEPARATOR {:}


!|Paths for ClojureSlim.|
!path fitnesse.jar
!path clojureslim/lib/clojure-1.2.1.jar
Expand All @@ -19,3 +20,4 @@ The project will be run in very short iterations.
!|Path for the fixtures.|
!path ../spec

}}}
2 changes: 1 addition & 1 deletion fitnesse/FitNesseRoot/properties
@@ -1,2 +1,2 @@
#FitNesse properties
Version=v20110104
Version=v20110806
9 changes: 2 additions & 7 deletions fitnesse/FitNesseRoot/updateList
Expand Up @@ -18,13 +18,6 @@ FitNesseRoot/files/images/stop.gif
FitNesseRoot/files/images/virtualPage.jpg
FitNesseRoot/files/css/fitnesse_base.css
FitNesseRoot/files/css/jquery.autocomplete.css
FitNesseRoot/files/javascript/jsunit/app/jsUnitCore.js
FitNesseRoot/files/javascript/jsunit/app/jsUnitMockTimeout.js
FitNesseRoot/files/javascript/jsunit/app/jsUnitTestManager.js
FitNesseRoot/files/javascript/jsunit/app/jsUnitTestSuite.js
FitNesseRoot/files/javascript/jsunit/app/jsUnitTracer.js
FitNesseRoot/files/javascript/jsunit/app/jsUnitVersionCheck.js
FitNesseRoot/files/javascript/jsunit/app/xbDebug.js
FitNesseRoot/files/javascript/SpreadsheetTranslator.js
FitNesseRoot/files/javascript/WikiFormatter.js
FitNesseRoot/files/javascript/clientSideSort.js
Expand Down Expand Up @@ -484,6 +477,8 @@ FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSubsetQuery/conten
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSubsetQuery/properties.xml
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSymbolsDontGetTurnedToStringsInTheOutput/content.txt
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSymbolsDontGetTurnedToStringsInTheOutput/properties.xml
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTwoIdenticalTablesOnPageDontConflict/content.txt
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTwoIdenticalTablesOnPageDontConflict/properties.xml
FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/content.txt
Expand Down
6 changes: 0 additions & 6 deletions fitnesse/clojureslim/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions fitnesse/clojureslim/README.md

This file was deleted.

1 change: 0 additions & 1 deletion fitnesse/clojureslim/bin/clojureslim

This file was deleted.

201 changes: 0 additions & 201 deletions fitnesse/clojureslim/examples/clojureslim/fixtures.clj

This file was deleted.

1 change: 0 additions & 1 deletion fitnesse/clojureslim/examples/me.clj

This file was deleted.

7 changes: 0 additions & 7 deletions fitnesse/clojureslim/project.clj

This file was deleted.

0 comments on commit 0a8814c

Please sign in to comment.