|
@@ -122,7 +122,9 @@ public class SnippetsTask extends DefaultTask {
|
|
|
+ "contain `curl`.")
|
|
|
}
|
|
|
}
|
|
|
- if (snippet.testResponse && snippet.language == 'js') {
|
|
|
+ if (snippet.testResponse
|
|
|
+ && 'js' == snippet.language
|
|
|
+ && null == snippet.skip) {
|
|
|
String quoted = snippet.contents
|
|
|
// quote values starting with $
|
|
|
.replaceAll(/([:,])\s*(\$[^ ,\n}]+)/, '$1 "$2"')
|
|
@@ -216,7 +218,7 @@ public class SnippetsTask extends DefaultTask {
|
|
|
return
|
|
|
}
|
|
|
if (it.group(4) != null) {
|
|
|
- snippet.skipTest = it.group(4)
|
|
|
+ snippet.skip = it.group(4)
|
|
|
return
|
|
|
}
|
|
|
if (it.group(5) != null) {
|
|
@@ -249,7 +251,7 @@ public class SnippetsTask extends DefaultTask {
|
|
|
substitutions = []
|
|
|
}
|
|
|
String loc = "$file:$lineNumber"
|
|
|
- parse(loc, matcher.group(2), /(?:$SUBSTITUTION|$CAT) ?/) {
|
|
|
+ parse(loc, matcher.group(2), /(?:$SUBSTITUTION|$CAT|$SKIP) ?/) {
|
|
|
if (it.group(1) != null) {
|
|
|
// TESTRESPONSE[s/adsf/jkl/]
|
|
|
substitutions.add([it.group(1), it.group(2)])
|
|
@@ -259,6 +261,9 @@ public class SnippetsTask extends DefaultTask {
|
|
|
substitutions.add(['\n$', '\\\\s*/'])
|
|
|
substitutions.add(['( +)', '$1\\\\s+'])
|
|
|
substitutions.add(['\n', '\\\\s*\n '])
|
|
|
+ } else if (it.group(4) != null) {
|
|
|
+ // TESTRESPONSE[skip:reason]
|
|
|
+ snippet.skip = it.group(4)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -312,7 +317,7 @@ public class SnippetsTask extends DefaultTask {
|
|
|
boolean test = false
|
|
|
boolean testResponse = false
|
|
|
boolean testSetup = false
|
|
|
- String skipTest = null
|
|
|
+ String skip = null
|
|
|
boolean continued = false
|
|
|
String language = null
|
|
|
String catchPart = null
|
|
@@ -337,8 +342,8 @@ public class SnippetsTask extends DefaultTask {
|
|
|
if (catchPart) {
|
|
|
result += "[catch: $catchPart]"
|
|
|
}
|
|
|
- if (skipTest) {
|
|
|
- result += "[skip=$skipTest]"
|
|
|
+ if (skip) {
|
|
|
+ result += "[skip=$skip]"
|
|
|
}
|
|
|
if (continued) {
|
|
|
result += '[continued]'
|
|
@@ -352,6 +357,9 @@ public class SnippetsTask extends DefaultTask {
|
|
|
}
|
|
|
if (testResponse) {
|
|
|
result += '// TESTRESPONSE'
|
|
|
+ if (skip) {
|
|
|
+ result += "[skip=$skip]"
|
|
|
+ }
|
|
|
}
|
|
|
if (testSetup) {
|
|
|
result += '// TESTSETUP'
|