Skip to content
This repository was archived by the owner on Sep 2, 2023. It is now read-only.

Commit 9f32ada

Browse files
author
Anna Tong
committed
Merge pull request #2496 from darkdarkdragon/release-e2e-fixe
e2e fixes to release branch
2 parents da4f1a6 + 94dd1d7 commit 9f32ada

23 files changed

+3930
-24
lines changed

Diff for: ‎test/joinPrivateTests.js

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/**
2+
*
3+
*
4+
*/
5+
6+
(function() {
7+
'use strict';
8+
9+
var fs = require('fs');
10+
var privateDevPath = 'selenium/tests-private-dev';
11+
var privatePath = 'selenium/tests-private/PrivateTests';
12+
13+
function dump(contObj, num) {
14+
var resStr = JSON.stringify(contObj, null, 2);
15+
fs.writeFileSync(privatePath + num + '.json', resStr);
16+
}
17+
18+
function main() {
19+
var dirs = fs.readdirSync(privateDevPath);
20+
//console.log(dirs);
21+
var resObj = null;
22+
var c = 0;
23+
var x = 0;
24+
for (var i = 0; i < dirs.length; i++) {
25+
console.log(dirs[i]);
26+
var content = fs.readFileSync(privateDevPath + '/' + dirs[i]);
27+
var obj = JSON.parse(content);
28+
if (resObj === null) {
29+
resObj = obj;
30+
} else {
31+
resObj.steps = resObj.steps.concat(obj.steps);
32+
}
33+
if (++c == 4) {
34+
c = 0;
35+
dump(resObj, x++);
36+
resObj = null;
37+
}
38+
}
39+
if (resObj) {
40+
dump(resObj, x++);
41+
}
42+
}
43+
44+
main();
45+
46+
})();

Diff for: ‎test/selenium/tests-private/AddTrust.json renamed to ‎test/selenium/tests-private-dev/AddTrust.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"type": "clickElement",
6161
"locator": {
6262
"type": "link text",
63-
"value": "Gateways"
63+
"value": "Add any gateway (trust lines)"
6464
}
6565
},
6666
{
@@ -93,6 +93,10 @@
9393
},
9494
"text": "~snapswap"
9595
},
96+
{
97+
"type": "pause",
98+
"waitTime": "3000"
99+
},
96100
{
97101
"type": "setElementText",
98102
"locator": {

Diff for: ‎test/selenium/tests-private/CustomGatewaysBRL.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysBRL.json

+11-3
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,15 @@
6767
"type": "waitForTextPresent",
6868
"text": "Brazil"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
7377
"type": "xpath",
74-
"value": "//div[@id='t-brl']//button[.='Add RippexAdding...']"
78+
"value": "//div[@id='t-brl']//button[.=' Add Rippex Adding...']"
7579
}
7680
},
7781
{
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -218,6 +222,10 @@
218222
"value": "disabled",
219223
"negated": true
220224
},
225+
{
226+
"type": "pause",
227+
"waitTime": "1000"
228+
},
221229
{
222230
"type": "clickElement",
223231
"locator": {
@@ -227,7 +235,7 @@
227235
},
228236
{
229237
"type": "waitForTextPresent",
230-
"text": "Australian",
238+
"text": "Real",
231239
"negated": true
232240
},
233241
{

Diff for: ‎test/selenium/tests-private/CustomGatewaysEUR.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysEUR.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"type": "waitForTextPresent",
6868
"text": "Euro"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -227,7 +231,7 @@
227231
},
228232
{
229233
"type": "waitForTextPresent",
230-
"text": "Australian",
234+
"text": "Euro",
231235
"negated": true
232236
},
233237
{

Diff for: ‎test/selenium/tests-private/CustomGatewaysJPY.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysJPY.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"type": "waitForTextPresent",
6868
"text": "Tokyo"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -227,7 +231,7 @@
227231
},
228232
{
229233
"type": "waitForTextPresent",
230-
"text": "Australian",
234+
"text": "Japanese",
231235
"negated": true
232236
},
233237
{

Diff for: ‎test/selenium/tests-private/CustomGatewaysMXN.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysMXN.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"type": "waitForTextPresent",
6868
"text": "Mexican"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -227,7 +231,7 @@
227231
},
228232
{
229233
"type": "waitForTextPresent",
230-
"text": "Australian",
234+
"text": "Mexican",
231235
"negated": true
232236
},
233237
{

Diff for: ‎test/selenium/tests-private/CustomGatewaysSGD.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysSGD.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"type": "waitForTextPresent",
6868
"text": "Singapore"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -227,7 +231,7 @@
227231
},
228232
{
229233
"type": "waitForTextPresent",
230-
"text": "Australian",
234+
"text": "Singapore",
231235
"negated": true
232236
},
233237
{

Diff for: ‎test/selenium/tests-private/CustomGatewaysUSD.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysUSD.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"type": "waitForTextPresent",
6868
"text": "USA"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -227,7 +231,7 @@
227231
},
228232
{
229233
"type": "waitForTextPresent",
230-
"text": "Australian",
234+
"text": "Dollar",
231235
"negated": true
232236
},
233237
{

Diff for: ‎test/selenium/tests-private/CustomGatewaysXAU.json renamed to ‎test/selenium/tests-private-dev/CustomGatewaysXAU.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"type": "waitForTextPresent",
6868
"text": "Gold"
6969
},
70+
{
71+
"type": "pause",
72+
"waitTime": "3000"
73+
},
7074
{
7175
"type": "clickElement",
7276
"locator": {
@@ -171,7 +175,7 @@
171175
"type": "clickElement",
172176
"locator": {
173177
"type": "link text",
174-
"value": "Gateways"
178+
"value": "Add any gateway (trust lines)"
175179
}
176180
},
177181
{
@@ -227,7 +231,7 @@
227231
},
228232
{
229233
"type": "waitForTextPresent",
230-
"text": "Australian",
234+
"text": "Gold",
231235
"negated": true
232236
},
233237
{

Diff for: ‎test/selenium/tests-private/SendBTC.json renamed to ‎test/selenium/tests-private-dev/SendBTC.json

File renamed without changes.

Diff for: ‎test/selenium/tests-private/SendFederation.json renamed to ‎test/selenium/tests-private-dev/SendFederation.json

File renamed without changes.

Diff for: ‎test/selenium/tests-private/SendLimits.json renamed to ‎test/selenium/tests-private-dev/SendLimits.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"type": "id",
1818
"value": "login_username"
1919
},
20-
"text": "${FUNDED_USER_NAME}"
20+
"text": "${FUNDED_USER_NAME2}"
2121
},
2222
{
2323
"type": "setElementText",
2424
"locator": {
2525
"type": "id",
2626
"value": "login_password"
2727
},
28-
"text": "${FUNDED_USER_PASSWORD}"
28+
"text": "${FUNDED_USER_PASSWORD2}"
2929
},
3030
{
3131
"type": "clickElement",

Diff for: ‎test/selenium/tests-private/SendUSD.json renamed to ‎test/selenium/tests-private-dev/SendUSD.json

File renamed without changes.

Diff for: ‎test/selenium/tests-private/SendXrp.json renamed to ‎test/selenium/tests-private-dev/SendXrp.json

File renamed without changes.

Diff for: ‎test/selenium/tests-private/TradeNonXRP.json renamed to ‎test/selenium/tests-private-dev/TradeNonXRP.json

+32-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"type": "id",
1818
"value": "login_username"
1919
},
20-
"text": "${FUNDED_USER_NAME}"
20+
"text": "${FUNDED_USER_NAME2}"
2121
},
2222
{
2323
"type": "setElementText",
2424
"locator": {
2525
"type": "id",
2626
"value": "login_password"
2727
},
28-
"text": "${FUNDED_USER_PASSWORD}"
28+
"text": "${FUNDED_USER_PASSWORD2}"
2929
},
3030
{
3131
"type": "clickElement",
@@ -94,10 +94,25 @@
9494
},
9595
"text": "USD.Bitstamp/USD.Snapswap"
9696
},
97+
{
98+
"type": "pause",
99+
"waitTime": "1000"
100+
},
101+
{
102+
"type": "clickElement",
103+
"locator": {
104+
"type": "id",
105+
"value": "wrapper"
106+
}
107+
},
97108
{
98109
"type": "waitForTextPresent",
99110
"text": "BIDS"
100111
},
112+
{
113+
"type": "pause",
114+
"waitTime": "5000"
115+
},
101116
{
102117
"type": "setElementText",
103118
"locator": {
@@ -143,7 +158,7 @@
143158
"type": "id",
144159
"value": "popup_unlock_password"
145160
},
146-
"text": "${FUNDED_USER_PASSWORD}"
161+
"text": "${FUNDED_USER_PASSWORD2}"
147162
},
148163
{
149164
"type": "waitForElementAttribute",
@@ -269,6 +284,20 @@
269284
"value": "submit"
270285
}
271286
},
287+
{
288+
"type": "waitForTextPresent",
289+
"text": "Confirm"
290+
},
291+
{
292+
"type": "clickElement",
293+
"locator": {
294+
"type": "xpath",
295+
"value": "//div[@class='actions']//button[.='Confirm']"
296+
}
297+
},
298+
299+
300+
272301
{
273302
"type": "waitForElementPresent",
274303
"locator": {

Diff for: ‎test/selenium/tests-private/TradePairsAddress.json renamed to ‎test/selenium/tests-private-dev/TradePairsAddress.json

File renamed without changes.

Diff for: ‎test/selenium/tests-private/TradePairsName.json renamed to ‎test/selenium/tests-private-dev/TradePairsName.json

File renamed without changes.

0 commit comments

Comments
 (0)