Add regex support, update docs

johnsusek · johnsusek · commit 9e25151a5e95 · 2019-08-21T18:09:52.000-05:00
diff --git a/docs/API.md b/docs/API.md
@@ -1,6 +1,6 @@
 # API
 
-```xml
+```vue
 <tests>
   <test>
     <set>
@@ -19,7 +19,7 @@
 <details>
  <summary>Details</summary>
 
-```xml
+```vue
 <tests for="ComponentPath">
 ```
 
@@ -35,7 +35,7 @@ This is the path to the component, used when importing it into your tests. Webpa
 <details>
  <summary>Details</summary>
 
-```xml
+```vue
 <test name="NameValue" BindingTarget="BindingValue">
 ```
 
@@ -55,13 +55,13 @@ Sets the data of your component to these values before running the test.
 The BindingTarget will be set to this value of the `context` variable in your `<script>` tag. 
 
 #### Examples:
-```xml
+```vue
 <test name="render app">
 ```
-```xml
+```vue
 <test name="render message correctly" :props="myProps">
 ```
-```xml
+```vue
 <test name="render data value correctly" :data="myData">
 ```
 
@@ -74,19 +74,19 @@ The BindingTarget will be set to this value of the `context` variable in your `<
 <details>
  <summary>Details</summary>
 
-```xml
+```vue
 <set selector="SelectorValue" value="Value" />
 ```
 
 Sets form input (text or select) value to Value.
 
 #### Examples:
 
-```xml
+```vue
 <set selector="input.first-name" value="Bob" />
 ```
 
-```xml
+```vue
 <set selector="select.title" value="Mr." />
 ```
 
@@ -99,19 +99,19 @@ Sets form input (text or select) value to Value.
 <details>
  <summary>Details</summary>
 
-```xml
+```vue
 <trigger selector="SelectorValue" event="EventValue" />
 ```
 
 Triggers event named EventValue on the element(s) returned by SelectorValue.
 
 #### Examples: 
 
-```xml
+```vue
 <trigger selector=".new-todo" event="keyup.enter" />
 ```
 
-```xml
+```vue
 <trigger selector=".el-select" event="change" />
 ```
 
@@ -124,7 +124,7 @@ Triggers event named EventValue on the element(s) returned by SelectorValue.
 <details>
  <summary>Details</summary>
 
-```xml
+```vue
 <expect ReturnValue Matcher="MatchedValue" />
 ```
 
@@ -152,10 +152,18 @@ Match html of the selector.
 
 Matches value as a substring of the matcher content.
 
+#### `:to-match`
+
+Same as above but with bindings. Pass context variable key name or regex.
+
 #### `to-equal`
 
 Matches value exactly on the matcher content.
 
+#### `:to-equal`
+
+Same as above but with bindings. Pass context variable key name or regex.
+
 #### `to-be-truthy`
 
 Matches anything that an "if" statement treats as true.
@@ -178,19 +186,31 @@ Matches if value is null.
 
 #### Examples:
 
-```xml
+```vue
 <expect html to-match="Welcome!" />
 ```
 
-```xml
+```vue
 <expect text-of=".todo-list li" to-match="First" />
 ```
 
-```xml
+```vue
+<expect text-of=".todo-list li" :to-match="/F.*t/" />
+```
+
+```vue
+<expect text-of=".todo-list li" :to-match="myMatchValue" />
+
+<script>
+let context = { myMatchValue: 'First' }
+</script>
+```
+
+```vue
 <expect text-of=".todo-list" to-be-falsy />
 ```
 
-```xml
+```vue
 <expect html to-match="Welcome!">
   <html>
     <h1> foo </h1>
@@ -207,7 +227,7 @@ Matches if value is null.
 <details>
  <summary>Details</summary>
 
-```xml
+```vue
 <script>
   let context = {...}
 </script>
@@ -218,7 +238,7 @@ The contents of the `<script>` tag are executed before your tests start.
 The special `context` variable is where bindings connect to your data; e.g. `:props="myProps"` sets your component's props to whatever is in `context.myProps`. This must be defined if you are using bindings.
 
 #### Examples:
-```xml
+```vue
 <script>
 let context = {
   myProps: {
diff --git a/src/generate/expect.js b/src/generate/expect.js
@@ -41,7 +41,9 @@ function generateExpect(expect) {
   }
   else if (expect.$[':to-match']) {
     comparisonFn = 'toMatch';
-    expectedValue = 'context.' + expect.$[':to-match'];
+    let matchBindingValue = expect.$[':to-match'];
+    expectedValue = matchBindingValue.startsWith('/') ? '' : 'context.';
+    expectedValue += matchBindingValue
   }
   else if (expect.$['to-match']) {
     comparisonFn = 'toMatch';

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ function generateExpect(expect) {`
`41`	`41`	`}`
`42`	`42`	`else if (expect.$[':to-match']) {`
`43`	`43`	`comparisonFn = 'toMatch';`
`44`		`- expectedValue = 'context.' + expect.$[':to-match'];`
	`44`	`+ let matchBindingValue = expect.$[':to-match'];`
	`45`	`+ expectedValue = matchBindingValue.startsWith('/') ? '' : 'context.';`
	`46`	`+ expectedValue += matchBindingValue`
`45`	`47`	`}`
`46`	`48`	`else if (expect.$['to-match']) {`
`47`	`49`	`comparisonFn = 'toMatch';`