Skip to content

Commit

Permalink
Merge pull request #68 from georgejecook/bugfix/rooibos-cli-compatabi…
Browse files Browse the repository at this point in the history 
…lity

fixes compatability issues with rooibos cli
  • Loading branch information
@georgejecook
georgejecook authored Aug 10, 2019
2 parents 815a61f + 7cafe52 commit 3d4e5f3
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 deletions dist/rooibosDist.brs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ function Rooibos__Init(preTestSetup = invalid, testUtilsDecoratorMethodName = in
? "#TEST START : ###" ; testId ; "###"
args.testScene = scene
args.global = m.global
rooibosVersion = "3.1"
requiredRooibosPreprocessorVersion = "3.1.0"
rooibosVersion = "3.1.0"
requiredRooibosPreprocessorVersion = "1.0.0"
if not RBS_CMN_isFunction(RBSFM_getPreprocessorVersion)
versionError = "You are using a rooibos-preprocessor (i.e. rooibosC) version older than 3.1 - please update to " + requiredRooibosPreprocessorVersion
versionError = "You are using a rooibos-preprocessor (i.e. rooibos-cli) version older than 1.0.0 - please update to " + requiredRooibosPreprocessorVersion
else
if RBSFM_getPreprocessorVersion() = requiredRooibosPreprocessorVersion
versionError = ""
else
versionError = "Your rooibos-preprocessor (i.e. rooibosC) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-preprocessor to version " + requiredRooibosPreprocessorVersion
versionError = "Your rooibos-preprocessor (i.e. rooibos-cli) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-cli to version " + requiredRooibosPreprocessorVersion
end if
end if
if versionError = ""
Expand Down
10 changes: 5 additions & 5 deletions docs/Rooibos.brs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@ <h1 class="page-title">Rooibos.brs</h1>

args.testScene = scene
args.global = m.global
rooibosVersion = "3.1"
requiredRooibosPreprocessorVersion = "3.1.0"
rooibosVersion = "3.1.0"
requiredRooibosPreprocessorVersion = "1.0.0"

if not RBS_CMN_isFunction(RBSFM_getPreprocessorVersion)
versionError = "You are using a rooibos-preprocessor (i.e. rooibosC) version older than 3.1 - please update to " + requiredRooibosPreprocessorVersion
versionError = "You are using a rooibos-preprocessor (i.e. rooibos-cli) version older than 1.0.0 - please update to " + requiredRooibosPreprocessorVersion
else
if RBSFM_getPreprocessorVersion() = requiredRooibosPreprocessorVersion
versionError = ""
else
versionError = "Your rooibos-preprocessor (i.e. rooibosC) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-preprocessor to version " + requiredRooibosPreprocessorVersion
versionError = "Your rooibos-preprocessor (i.e. rooibos-cli) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-cli to version " + requiredRooibosPreprocessorVersion
end if
end if

Expand Down Expand Up @@ -149,7 +149,7 @@ <h1 class="page-title">Rooibos.brs</h1>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Rooibos_BaseTestSuite.brs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@ <h1 class="page-title">Rooibos_BaseTestSuite.brs</h1>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Rooibos_CommonUtils.brs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ <h1 class="page-title">Rooibos_CommonUtils.brs</h1>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Rooibos_ItemGenerator.brs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ <h1 class="page-title">Rooibos_ItemGenerator.brs</h1>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Rooibos_TestRunner.brs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ <h1 class="page-title">Rooibos_TestRunner.brs</h1>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/module-BaseTestSuite.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12420,7 +12420,7 @@ <h5>Returns:</h5>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/module-CommonUtils.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5062,7 +5062,7 @@ <h5>Returns:</h5>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/module-ItemGenerator.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ <h5>Returns:</h5>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/module-TestRunner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ <h4 class="name" id="Run"><span class="type-signature"></span>Run<span class="si
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/module-rooibosh.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ <h5>Parameters:</h5>
<br class="clear">

<footer>
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Aug 04 2019 08:33:57 GMT-0500 (-05) using the Minami theme.
Generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Aug 09 2019 23:57:24 GMT-0500 (-05) using the Minami theme.
</footer>

<script>prettyPrint();</script>
Expand Down
8 changes: 4 additions & 4 deletions samples/example/source/tests/rooibos/rooibosDist.brs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ function Rooibos__Init(preTestSetup = invalid, testUtilsDecoratorMethodName = in
? "#TEST START : ###" ; testId ; "###"
args.testScene = scene
args.global = m.global
rooibosVersion = "3.1"
requiredRooibosPreprocessorVersion = "3.1.0"
rooibosVersion = "3.1.0"
requiredRooibosPreprocessorVersion = "1.0.0"
if not RBS_CMN_isFunction(RBSFM_getPreprocessorVersion)
versionError = "You are using a rooibos-preprocessor (i.e. rooibosC) version older than 3.1 - please update to " + requiredRooibosPreprocessorVersion
versionError = "You are using a rooibos-preprocessor (i.e. rooibos-cli) version older than 1.0.0 - please update to " + requiredRooibosPreprocessorVersion
else
if RBSFM_getPreprocessorVersion() = requiredRooibosPreprocessorVersion
versionError = ""
else
versionError = "Your rooibos-preprocessor (i.e. rooibosC) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-preprocessor to version " + requiredRooibosPreprocessorVersion
versionError = "Your rooibos-preprocessor (i.e. rooibos-cli) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-cli to version " + requiredRooibosPreprocessorVersion
end if
end if
if versionError = ""
Expand Down
8 changes: 4 additions & 4 deletions src/Rooibos.brs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ function Rooibos__Init(preTestSetup = invalid, testUtilsDecoratorMethodName = in

args.testScene = scene
args.global = m.global
rooibosVersion = "3.1"
requiredRooibosPreprocessorVersion = "3.1.0"
rooibosVersion = "3.1.0"
requiredRooibosPreprocessorVersion = "1.0.0"

if not RBS_CMN_isFunction(RBSFM_getPreprocessorVersion)
versionError = "You are using a rooibos-preprocessor (i.e. rooibosC) version older than 3.1 - please update to " + requiredRooibosPreprocessorVersion
versionError = "You are using a rooibos-preprocessor (i.e. rooibos-cli) version older than 1.0.0 - please update to " + requiredRooibosPreprocessorVersion
else
if RBSFM_getPreprocessorVersion() = requiredRooibosPreprocessorVersion
versionError = ""
else
versionError = "Your rooibos-preprocessor (i.e. rooibosC) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-preprocessor to version " + requiredRooibosPreprocessorVersion
versionError = "Your rooibos-preprocessor (i.e. rooibos-cli) version '" + RBSFM_getPreprocessorVersion() + "' is not compatible with rooibos version " + rooibosVersion + ". Please upgrade your rooibos-cli to version " + requiredRooibosPreprocessorVersion
end if
end if

Expand Down

0 comments on commit 3d4e5f3

Please sign in to comment.