Skip to content

Commit

Permalink
Merge pull request Marklogic-retired#124 in PROD/explorer-ui from ~TI…
Browse files Browse the repository at this point in the history
…SANGUL/explorer-ui:DHFPROD-3622 to develop

* commit '807a2acfbd03519f690b0bf3285c6bfa9b7914bc':
  add missing parameter
  fixed the sxml flow
  add [hash] to the junit reports
  add missing parameter
  updated xml scenarios tests
  • Loading branch information
Bruce An authored and Bruce An committed Nov 9, 2019
2 parents fe46814 + 807a2ac commit 7b8dd19
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 126 deletions.
2 changes: 1 addition & 1 deletion e2e/cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"video": true,
"reporter": "junit",
"reporterOptions": {
"mochaFile": "results/cypress-report.xml",
"mochaFile": "results/cypress-report[hash].xml",
"toConsole": true
}
}
43 changes: 23 additions & 20 deletions e2e/qa-project/input/person-xml/person1.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<root>
<age>35</age>
<balance>$2,511.70</balance>
<city>Vaughn</city>
<company>MITROC</company>
<email>[email protected]</email>
<eyeColor>brown</eyeColor>
<favoriteFruit>banana</favoriteFruit>
<fname>Alex</fname>
<gender>male</gender>
<id>0</id>
<isActive>false</isActive>
<lname>Hopkins</lname>
<phone>+1 (988) 597-3702</phone>
<registered>2014-10-29T06:15:24 +07:00</registered>
<state>Utah</state>
<street>577 Ditmas Avenue</street>
<synonym>big</synonym>
<zip>90644</zip>
</root>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<person>
<age>35</age>
<balance>$2,511.70</balance>
<city>Vaughn</city>
<company>MITROC</company>
<email>[email protected]</email>
<eyeColor>brown</eyeColor>
<favoriteFruit>banana</favoriteFruit>
<fname>Alex</fname>
<gender>male</gender>
<id>0</id>
<isActive>false</isActive>
<lname>Hopkins</lname>
<phone>+1 (988) 597-3702</phone>
<registered>2014-10-29T06:15:24 +07:00</registered>
<state>Utah</state>
<street>577 Ditmas Avenue</street>
<synonym>big</synonym>
<zip>90644</zip>
</person>
</root>
45 changes: 24 additions & 21 deletions e2e/qa-project/input/person-xml/person2.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<root>
<age>45</age>
<balance>$3,614.67</balance>
<city>Wyoming</city>
<company>COMVENE</company>
<email>[email protected]</email>
<eyeColor>green</eyeColor>
<favoriteFruit>apple</favoriteFruit>
<fname>John</fname>
<gender>male</gender>
<id>0</id>
<isActive>true</isActive>
<lastname>Hopkins</lastname>
<lname>Hopkins</lname>
<phone>+1 (988) 597-3702</phone>
<registered>2014-08-10T02:46:25 +07:00</registered>
<state>District Of Columbia</state>
<street>428 Aster Court</street>
<synonym>large</synonym>
<zip>90644-0000</zip>
</root>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<person>
<age>45</age>
<balance>$3,614.67</balance>
<city>Wyoming</city>
<company>COMVENE</company>
<email>[email protected]</email>
<eyeColor>green</eyeColor>
<favoriteFruit>apple</favoriteFruit>
<fname>John</fname>
<gender>male</gender>
<id>0</id>
<isActive>true</isActive>
<lastname>Hopkins</lastname>
<lname>Hopkins</lname>
<phone>+1 (988) 597-3702</phone>
<registered>2014-08-10T02:46:25 +07:00</registered>
<state>District Of Columbia</state>
<street>428 Aster Court</street>
<synonym>large</synonym>
<zip>90644-0000</zip>
</person>
</root>
43 changes: 23 additions & 20 deletions e2e/qa-project/input/person-xml/person3.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<root>
<age>35</age>
<balance>$2,882.72</balance>
<city>Caberfae</city>
<company>BIZMATIC</company>
<email>[email protected]</email>
<eyeColor>blue</eyeColor>
<favoriteFruit>strawberry</favoriteFruit>
<fname>Linda</fname>
<gender>female</gender>
<id>2</id>
<isActive>true</isActive>
<lname>Daniel</lname>
<phone>+1 (812) 472-2940</phone>
<registered>2015-04-06T07:32:03 +07:00</registered>
<state>Maryland</state>
<street>889 Hendrix Street</street>
<synonym>match</synonym>
<zip>68155</zip>
</root>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<person>
<age>35</age>
<balance>$2,882.72</balance>
<city>Caberfae</city>
<company>BIZMATIC</company>
<email>[email protected]</email>
<eyeColor>blue</eyeColor>
<favoriteFruit>strawberry</favoriteFruit>
<fname>Linda</fname>
<gender>female</gender>
<id>2</id>
<isActive>true</isActive>
<lname>Daniel</lname>
<phone>+1 (812) 472-2940</phone>
<registered>2015-04-06T07:32:03 +07:00</registered>
<state>Maryland</state>
<street>889 Hendrix Street</street>
<synonym>match</synonym>
<zip>68155</zip>
</person>
</root>
43 changes: 23 additions & 20 deletions e2e/qa-project/input/person-xml/person4.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<root>
<age>22</age>
<balance>$3,707.20</balance>
<city>Vicksburg</city>
<company>ETERNIS</company>
<email>[email protected]</email>
<eyeColor>brown</eyeColor>
<favoriteFruit>banana</favoriteFruit>
<fname>Berta</fname>
<gender>female</gender>
<id>3</id>
<isActive>false</isActive>
<lname>Murphy</lname>
<phone>+1 (819) 531-2294</phone>
<registered>2016-05-21T03:33:06 +07:00</registered>
<state>Mississippi</state>
<street>683 Reed Street</street>
<synonym>sport</synonym>
<zip>86288</zip>
</root>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<person>
<age>22</age>
<balance>$3,707.20</balance>
<city>Vicksburg</city>
<company>ETERNIS</company>
<email>[email protected]</email>
<eyeColor>brown</eyeColor>
<favoriteFruit>banana</favoriteFruit>
<fname>Berta</fname>
<gender>female</gender>
<id>3</id>
<isActive>false</isActive>
<lname>Murphy</lname>
<phone>+1 (819) 531-2294</phone>
<registered>2016-05-21T03:33:06 +07:00</registered>
<state>Mississippi</state>
<street>683 Reed Street</street>
<synonym>sport</synonym>
<zip>86288</zip>
</person>
</root>
43 changes: 23 additions & 20 deletions e2e/qa-project/input/person-xml/person5.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<root>
<age>31</age>
<balance>$1,817.14</balance>
<city>Richville</city>
<company>BISBA</company>
<email>[email protected]</email>
<eyeColor>blue</eyeColor>
<favoriteFruit>strawberry</favoriteFruit>
<fname>Garrison</fname>
<gender>male</gender>
<id>4</id>
<isActive>true</isActive>
<lname>Stevenson</lname>
<phone>+1 (857) 482-3202</phone>
<registered>2018-06-28T06:18:31 +07:00</registered>
<state>Nevada</state>
<street>677 Estate Road</street>
<synonym>test</synonym>
<zip>32830</zip>
</root>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<person>
<age>31</age>
<balance>$1,817.14</balance>
<city>Richville</city>
<company>BISBA</company>
<email>[email protected]</email>
<eyeColor>blue</eyeColor>
<favoriteFruit>strawberry</favoriteFruit>
<fname>Garrison</fname>
<gender>male</gender>
<id>4</id>
<isActive>true</isActive>
<lname>Stevenson</lname>
<phone>+1 (857) 482-3202</phone>
<registered>2018-06-28T06:18:31 +07:00</registered>
<state>Nevada</state>
<street>677 Estate Road</street>
<synonym>test</synonym>
<zip>32830</zip>
</person>
</root>
43 changes: 23 additions & 20 deletions e2e/qa-project/input/person-xml/person6.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<root>
<age>38</age>
<balance>$3,116.77</balance>
<city>Clay</city>
<company>PLAYCE</company>
<email>[email protected]</email>
<eyeColor>blue</eyeColor>
<favoriteFruit>banana</favoriteFruit>
<fname>Hurst</fname>
<gender>male</gender>
<id>6</id>
<isActive>false</isActive>
<lname>Lara</lname>
<phone>+1 (830) 497-3371</phone>
<registered>2017-05-10T11:54:14 +07:00</registered>
<state>Texas</state>
<street>463 Fair Street</street>
<synonym>race</synonym>
<zip>12425</zip>
</root>
<?xml version="1.0" encoding="UTF-8"?>
<root>
<person>
<age>38</age>
<balance>$3,116.77</balance>
<city>Clay</city>
<company>PLAYCE</company>
<email>[email protected]</email>
<eyeColor>blue</eyeColor>
<favoriteFruit>banana</favoriteFruit>
<fname>Hurst</fname>
<gender>male</gender>
<id>6</id>
<isActive>false</isActive>
<lname>Lara</lname>
<phone>+1 (830) 497-3371</phone>
<registered>2017-05-10T11:54:14 +07:00</registered>
<state>Texas</state>
<street>463 Fair Street</street>
<synonym>race</synonym>
<zip>12425</zip>
</person>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
"version" : 1,
"targetEntityType" : "http://example.org/PersonXML-0.0.1/PersonXML",
"sourceContext" : "/",
"sourceURI" : "/C/dev/fork/marklogic-data-hub/web/e2e/qa-project/input/person-xml/person1.xml",
"sourceURI" : "/C/dev/fork/explorer-ui/e2e/qa-project/input/person-xml/person2.xml",
"properties" : {
"fname" : {
"sourcedFrom" : "fname"
"sourcedFrom" : "person/fname"
},
"lname" : {
"sourcedFrom" : "lname"
"sourcedFrom" : "person/lname"
},
"id" : {
"sourcedFrom" : "id"
"sourcedFrom" : "person/id"
}
}
}

0 comments on commit 7b8dd19

Please sign in to comment.